diff --git a/app/[locale]/(user)/datasets/[datasetIdentifier]/components/AccessModels/index.tsx b/app/[locale]/(user)/datasets/[datasetIdentifier]/components/AccessModels/index.tsx
index 06ccb173..40d1d8ab 100644
--- a/app/[locale]/(user)/datasets/[datasetIdentifier]/components/AccessModels/index.tsx
+++ b/app/[locale]/(user)/datasets/[datasetIdentifier]/components/AccessModels/index.tsx
@@ -93,20 +93,16 @@ const generateTableData = (resources: any[]) => {
   }));
 };
 
-const accessModelResourcesQuery = graphql(`
+const accessModelResourcesQuery: any = graphql(`
   query accessModelResource($datasetId: UUID!) {
     accessModelResources(datasetId: $datasetId) {
-      modelResources {
+      resourceFields {
         resource {
           name
           description
           id
         }
-        fields {
-          fieldName
-          format
-          id
-        }
+        fields
       }
       id
       name
@@ -121,87 +117,91 @@ const accessModelResourcesQuery = graphql(`
 const AccessModels = () => {
   const params = useParams();
 
-  const { data, error, isLoading } = useQuery(
-    [`accessmodel_${params.datasetIdentifier}`],
-    () =>
-      GraphQL(
-        accessModelResourcesQuery,
-        {
-          // Entity Headers if present
-        },
-        {
-          datasetId: params.datasetIdentifier,
-        }
-      )
+  const getAccessModeldetails: {
+    data: any;
+    isError: boolean;
+    isLoading: boolean;
+  } = useQuery([`accessmodel_${params.datasetIdentifier}`], () =>
+    GraphQL(
+      accessModelResourcesQuery,
+      {
+        // Entity Headers if present
+      },
+      {
+        datasetId: params.datasetIdentifier,
+      }
+    )
   );
 
   return (
     <>
-      {isLoading ? (
+      {getAccessModeldetails.isLoading ? (
         <div className=" mt-8 flex justify-center">
           <Spinner />
         </div>
       ) : (
-        data?.accessModelResources.map((item: any, index: any) => (
-          <div
-            key={index}
-            className="my-4 flex flex-col gap-4 rounded-2 p-6 shadow-basicDeep"
-          >
-            <div className="mb-1 flex flex-wrap justify-between gap-1 lg:gap-0">
-              <div className="p2-4 lg:w-2/5">
-                <Text variant="headingMd">{item.name}</Text>
+        getAccessModeldetails.data?.accessModelResources.map(
+          (item: any, index: any) => (
+            <div
+              key={index}
+              className="my-4 flex flex-col gap-4 rounded-2 p-6 shadow-basicDeep"
+            >
+              <div className="mb-1 flex flex-wrap justify-between gap-1 lg:gap-0">
+                <div className="p2-4 lg:w-2/5">
+                  <Text variant="headingMd">{item.name}</Text>
+                </div>
+                <div className="lg:w-3/5 lg:pl-4">
+                  <Text>{item.description}</Text>
+                </div>
               </div>
-              <div className="lg:w-3/5 lg:pl-4">
-                <Text>{item.description}</Text>
+              <div className="align-center  flex flex-col justify-between gap-4 sm:flex-row lg:items-center">
+                <CustomTags type={item.type.split('.').pop().toLowerCase()} />
               </div>
-            </div>
-            <div className="align-center  flex flex-col justify-between gap-4 sm:flex-row lg:items-center">
-              <CustomTags type={item.type.split('.').pop().toLowerCase()} />
-            </div>
-            {item?.modelResources?.length > 0 && (
-              <div className="flex">
-                <Accordion type="single" collapsible className="w-full">
-                  <AccordionItem value="item-1" className=" border-none">
-                    <div className="flex flex-wrap items-center justify-between">
-                      <AccordionTrigger className="flex w-full flex-wrap items-center gap-2 hover:no-underline">
-                        <div className=" text-baseBlueSolid8  ">
-                          See Resources
-                        </div>
-                      </AccordionTrigger>
-                      <Button
-                        className="h-fit w-fit"
-                        kind="secondary"
-                        onClick={() => {
-                          item.modelResources.forEach((resource: any) => {
-                            // Construct the download URL for each resource
-                            const downloadUrl = `${process.env.NEXT_PUBLIC_BACKEND_URL}/api/download/resource/${resource.resource.id}`;
-                            // Open the URL in a new tab
-                            window.open(downloadUrl, '_blank');
-                          });
+              {item?.modelResources?.length > 0 && (
+                <div className="flex">
+                  <Accordion type="single" collapsible className="w-full">
+                    <AccordionItem value="item-1" className=" border-none">
+                      <div className="flex flex-wrap items-center justify-between">
+                        <AccordionTrigger className="flex w-full flex-wrap items-center gap-2 hover:no-underline">
+                          <div className=" text-baseBlueSolid8  ">
+                            See Resources
+                          </div>
+                        </AccordionTrigger>
+                        <Button
+                          className="h-fit w-fit"
+                          kind="secondary"
+                          onClick={() => {
+                            item.modelResources.forEach((resource: any) => {
+                              // Construct the download URL for each resource
+                              const downloadUrl = `${process.env.NEXT_PUBLIC_BACKEND_URL}/api/download/resource/${resource.resource.id}`;
+                              // Open the URL in a new tab
+                              window.open(downloadUrl, '_blank');
+                            });
+                          }}
+                        >
+                          Download All Resources
+                        </Button>
+                      </div>
+                      <AccordionContent
+                        className="flex w-full flex-col p-5"
+                        style={{
+                          backgroundColor: 'var( --base-pure-white)',
+                          outline: '1px solid var( --base-pure-white)',
                         }}
                       >
-                        Download All Resources
-                      </Button>
-                    </div>
-                    <AccordionContent
-                      className="flex w-full flex-col p-5"
-                      style={{
-                        backgroundColor: 'var( --base-pure-white)',
-                        outline: '1px solid var( --base-pure-white)',
-                      }}
-                    >
-                      <Table
-                        columns={generateColumnData()}
-                        rows={generateTableData(item.modelResources)}
-                        hideFooter
-                      />
-                    </AccordionContent>
-                  </AccordionItem>
-                </Accordion>
-              </div>
-            )}
-          </div>
-        ))
+                        <Table
+                          columns={generateColumnData()}
+                          rows={generateTableData(item.modelResources)}
+                          hideFooter
+                        />
+                      </AccordionContent>
+                    </AccordionItem>
+                  </Accordion>
+                </div>
+              )}
+            </div>
+          )
+        )
       )}
     </>
   );
diff --git a/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Details/index.tsx b/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Details/index.tsx
index 5b327dcb..dc3bb6a3 100644
--- a/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Details/index.tsx
+++ b/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Details/index.tsx
@@ -31,7 +31,9 @@ const DetailsQuery: any = graphql(`
         description
         id
         name
-        chart
+        chart {
+          options
+        }
       }
       ... on TypeResourceChartImage {
         name
@@ -65,7 +67,7 @@ const Details = () => {
       );
     }
 
-    return <ReactECharts option={item.chart} ref={chartRef} />;
+    return <ReactECharts option={item.chart.options} ref={chartRef} />;
   };
 
   return (
diff --git a/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Resources/index.tsx b/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Resources/index.tsx
index 91974cd3..135b540c 100644
--- a/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Resources/index.tsx
+++ b/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Resources/index.tsx
@@ -10,7 +10,7 @@ import { Button, Spinner, Tag, Text } from 'opub-ui';
 import { GraphQL } from '@/lib/api';
 import { formatDate } from '@/lib/utils';
 
-const datasetResourceQuery = graphql(`
+const datasetResourceQuery: any = graphql(`
   query datasetResources($datasetId: UUID!) {
     datasetResources(datasetId: $datasetId) {
       id
@@ -19,18 +19,7 @@ const datasetResourceQuery = graphql(`
       type
       name
       description
-      accessModels {
-        name
-        description
-        type
-        modelResources {
-          fields {
-            format
-            fieldName
-            description
-          }
-        }
-      }
+
       schema {
         fieldName
         id
@@ -47,7 +36,7 @@ const datasetResourceQuery = graphql(`
 const Resources = () => {
   const params = useParams();
 
-  const { data, isLoading } = useQuery(
+  const getResourceDetails: { data: any; isLoading: boolean } = useQuery(
     [`resources_${params.datasetIdentifier}`],
     () =>
       GraphQL(
@@ -87,62 +76,68 @@ const Resources = () => {
         }));
       }
     });
-  }, [data]);
+  }, [getResourceDetails.data]);
 
   return (
     <div className="w-full">
-      {isLoading ? (
+      {getResourceDetails.isLoading ? (
         <div className="mt-8 flex justify-center">
           <Spinner />
         </div>
-      ) : data && data?.datasetResources?.length > 0 ? (
+      ) : getResourceDetails.data &&
+        getResourceDetails.data?.datasetResources?.length > 0 ? (
         <>
           <Text variant="bodyLg" className="mx-6 lg:mx-0">
             Downloadable Resources
           </Text>
           <div className="mx-6 mt-5 flex flex-col gap-8 bg-surfaceDefault p-6 lg:mx-0">
-            {data?.datasetResources.map((item: any, index: number) => (
-              <div key={index} className="flex flex-wrap justify-between gap-4">
-                <div className="gap flex flex-col lg:w-4/5">
-                  <div className="item flex items-center gap-2">
-                    <Text variant="headingMd">{item.name}</Text>
-                    <Tag>{item.fileDetails.format}</Tag>
+            {getResourceDetails.data?.datasetResources.map(
+              (item: any, index: number) => (
+                <div
+                  key={index}
+                  className="flex flex-wrap justify-between gap-4"
+                >
+                  <div className="gap flex flex-col lg:w-4/5">
+                    <div className="item flex items-center gap-2">
+                      <Text variant="headingMd">{item.name}</Text>
+                      <Tag>{item.fileDetails.format}</Tag>
+                    </div>
+                    <div>
+                      <Text>Updated:</Text>
+                      <Text>{formatDate(item.modified)}</Text>
+                    </div>
+                    <div className="flex flex-col">
+                      <div
+                        ref={(el) => (descriptionRefs.current[index] = el)}
+                        className={!showMore[index] ? 'line-clamp-2' : ''}
+                      >
+                        <Text>{item.description}</Text>
+                      </div>
+                      {isDescriptionLong[index] && (
+                        <Button
+                          className="self-start p-2"
+                          onClick={() => toggleShowMore(index)}
+                          variant="interactive"
+                          size="slim"
+                          kind="tertiary"
+                        >
+                          {showMore[index] ? 'Show less' : 'Show more'}
+                        </Button>
+                      )}
+                    </div>
                   </div>
                   <div>
-                    <Text>Updated:</Text>
-                    <Text>{formatDate(item.modified)}</Text>
-                  </div>
-                  <div className="flex flex-col">
-                    <div
-                      ref={(el) => (descriptionRefs.current[index] = el)}
-                      className={!showMore[index] ? 'line-clamp-2' : ''}
+                    <Link
+                      href={`${process.env.NEXT_PUBLIC_BACKEND_URL}/api/download/resource/${item.id}`}
+                      target="_blank"
+                      className="flex justify-center"
                     >
-                      <Text>{item.description}</Text>
-                    </div>
-                    {isDescriptionLong[index] && (
-                      <Button
-                        className="self-start p-2"
-                        onClick={() => toggleShowMore(index)}
-                        variant="interactive"
-                        size="slim"
-                        kind="tertiary"
-                      >
-                        {showMore[index] ? 'Show less' : 'Show more'}
-                      </Button>
-                    )}
+                      <Button>Download</Button>
+                    </Link>
                   </div>
                 </div>
-                <div>
-                  <Link
-                    href={`${process.env.NEXT_PUBLIC_BACKEND_URL}/api/download/resource/${item.id}`}
-                    target="_blank"
-                    className="flex justify-center"
-                  >
-                    <Button>Download</Button>
-                  </Link>
-                </div>
-              </div>
-            ))}
+              )
+            )}
           </div>
         </>
       ) : (
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsImage.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsImage.tsx
index ccb26b89..b5d28846 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsImage.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsImage.tsx
@@ -40,7 +40,6 @@ const getResourceChartImageDetails: any = graphql(`
   }
 `);
 
-
 const getDatasetResourceChartImageDetails: any = graphql(`
   query resourceChartImages($datasetId: UUID!) {
     datasetResourceCharts(datasetId: $datasetId) {
@@ -55,9 +54,6 @@ const getDatasetResourceChartImageDetails: any = graphql(`
   }
 `);
 
-
-
-
 const AddResourceChartimage: any = graphql(`
   mutation GenerateResourceChartimage($dataset: UUID!) {
     addResourceChartImage(dataset: $dataset) {
@@ -71,9 +67,10 @@ const AddResourceChartimage: any = graphql(`
 `);
 
 const UpdateChartImageMutation: any = graphql(`
-  mutation updateChartImage($data: ResourceChartImageInputPartial!) {
-    updateResourceChartImage(data: $data) {
+  mutation updateChartImage($input: ResourceChartImageInputPartial!) {
+    updateResourceChartImage(input: $input) {
       __typename
+        ... on TypeResourceChartImage {{}
       id
       name
       description
@@ -81,6 +78,7 @@ const UpdateChartImageMutation: any = graphql(`
         name
         path
       }
+}
     }
   }
 `);
@@ -126,7 +124,7 @@ const ChartsImage: React.FC<ImageProps> = ({
           [params.entityType]: params.entitySlug,
         },
         {
-          datasetId: params.id
+          datasetId: params.id,
         }
       ),
     {}
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsList.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsList.tsx
index efcc1beb..d5edcd37 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsList.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsList.tsx
@@ -48,7 +48,7 @@ const deleteResourceChart: any = graphql(`
 `);
 
 const deleteResourceChartImage: any = graphql(`
-  mutation deleteResourceChartImage($resourceChartImageId: String!) {
+  mutation deleteResourceChartImage($resourceChartImageId: UUID!) {
     deleteResourceChartImage(resourceChartImageId: $resourceChartImageId)
   }
 `);
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsVisualize.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsVisualize.tsx
index 63818e89..c04e2050 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsVisualize.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/components/ChartsVisualize.tsx
@@ -226,8 +226,8 @@ const ChartsVisualize: React.FC<VisualizationProps> = ({
       chartId: resourceChart.id,
       description: resourceChart.description || '',
       filters:
-        resourceChart.filters?.length > 0
-          ? resourceChart.filters.map((filter: any) => ({
+        resourceChart.chartFilters?.length > 0
+          ? resourceChart.chartFilters.map((filter: any) => ({
               column: filter.column?.id,
               operator: filter.operator,
               value: filter.value,
@@ -235,19 +235,19 @@ const ChartsVisualize: React.FC<VisualizationProps> = ({
           : [{ column: '', operator: '==', value: '' }],
       name: resourceChart.name || '',
       options: {
-        aggregateType: resourceChart?.options?.aggregateType,
-        regionColumn: resourceChart?.options?.regionColumn?.id,
-        showLegend: resourceChart?.options?.showLegend ?? true,
-        timeColumn: resourceChart?.options?.timeColumn,
-        valueColumn: resourceChart?.options?.valueColumn?.id,
-        xAxisColumn: resourceChart?.options?.xAxisColumn?.id,
-        xAxisLabel: resourceChart?.options?.xAxisLabel,
-        yAxisColumn: resourceChart?.options?.yAxisColumn?.map((col: any) => ({
+        aggregateType: resourceChart?.chartOptions?.aggregateType,
+        regionColumn: resourceChart?.chartOptions?.regionColumn?.id,
+        showLegend: resourceChart?.chartOptions?.showLegend ?? true,
+        timeColumn: resourceChart?.chartOptions?.timeColumn,
+        valueColumn: resourceChart?.chartOptions?.valueColumn?.id,
+        xAxisColumn: resourceChart?.chartOptions?.xAxisColumn?.id,
+        xAxisLabel: resourceChart?.chartOptions?.xAxisLabel,
+        yAxisColumn: resourceChart?.chartOptions?.yAxisColumn?.map((col: any) => ({
           fieldName: col.field.id,
           label: col.label,
           color: col.color,
         })),
-        yAxisLabel: resourceChart?.options?.yAxisLabel,
+        yAxisLabel: resourceChart?.chartOptions?.yAxisLabel,
       },
       resource: resourceChart.resource?.id,
       type: resourceChart.chartType as ChartTypes,
@@ -445,8 +445,8 @@ const ChartsVisualize: React.FC<VisualizationProps> = ({
           />
           <div className="mb-6 flex flex-col gap-6 p-8 text-center">
             <Text>Preview</Text>
-            {chartData.chart && Object.keys(chartData.chart).length > 0 && (
-              <ReactECharts option={chartData.chart} ref={chartRef} />
+            {chartData.chart?.options && Object.keys(chartData.chart?.options).length > 0 && (
+              <ReactECharts option={chartData.chart?.options} ref={chartRef} />
             )}
           </div>
         </div>
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/queries/index.ts b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/queries/index.ts
index 5c8ec9ec..a1fdfa97 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/queries/index.ts
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/charts/queries/index.ts
@@ -36,8 +36,10 @@ export const getResourceChartDetails = graphql(`
       resource {
         id
       }
-      chart
-      filters {
+      chart {
+        options
+      }
+      chartFilters {
         column {
           id
           fieldName
@@ -45,7 +47,7 @@ export const getResourceChartDetails = graphql(`
         operator
         value
       }
-      options {
+      chartOptions {
         aggregateType
         xAxisColumn {
           id
@@ -88,7 +90,7 @@ export const createChart = graphql(`
           name
         }
         name
-        filters {
+        chartFilters {
           column {
             id
             fieldName
@@ -96,7 +98,7 @@ export const createChart = graphql(`
           operator
           value
         }
-        options {
+        chartOptions {
           aggregateType
           xAxisColumn {
             id
@@ -122,7 +124,9 @@ export const createChart = graphql(`
             fieldName
           }
         }
-        chart
+        chart {
+          options
+        }
       }
     }
   }
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/components/AccessModelForm.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/components/AccessModelForm.tsx
index 5fc0ef55..74e3f296 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/components/AccessModelForm.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/components/AccessModelForm.tsx
@@ -73,11 +73,8 @@ const editaccessModel: any = graphql(`
 const getAccessModelDetails: any = graphql(`
   query accessModel($accessModelId: UUID!) {
     accessModel(accessModelId: $accessModelId) {
-      modelResources {
-        fields {
-          id
-          fieldName
-        }
+      resourceFields {
+        fields
         resource {
           id
           name
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/publish/page.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/publish/page.tsx
index 74e0d229..0c294f24 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/publish/page.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/publish/page.tsx
@@ -23,7 +23,7 @@ import { GraphQL } from '@/lib/api';
 import { formatDate, toTitleCase } from '@/lib/utils';
 import { Icons } from '@/components/icons';
 
-const datasetSummaryQuery = graphql(`
+const datasetSummaryQuery:any = graphql(`
   query datasetsSummary($filters: DatasetFilter) {
     datasets(filters: $filters) {
       metadata {
@@ -46,22 +46,6 @@ const datasetSummaryQuery = graphql(`
           description
         }
       }
-      accessModels {
-        id
-        name
-        description
-        type
-        created
-        modified
-        modelResources {
-          resource {
-            name
-            description
-            id
-            type
-          }
-        }
-      }
       tags {
         id
         value
@@ -179,7 +163,7 @@ const Page = () => {
     id: string;
   }>();
 
-  const { data, isLoading, refetch } = useQuery([`summary_${params.id}`], () =>
+  const getDatasetsSummary:{ data:any, isLoading:any, refetch:any } = useQuery([`summary_${params.id}`], () =>
     GraphQL(
       datasetSummaryQuery,
       {
@@ -190,15 +174,15 @@ const Page = () => {
   );
 
   useEffect(() => {
-    refetch();
+    getDatasetsSummary.refetch();
   });
 
   const Summary = [
     {
       name: 'Resource',
-      data: data?.datasets[0]?.resources,
+      data: getDatasetsSummary.data?.datasets[0]?.resources,
       error:
-        data && data?.datasets[0]?.resources.length === 0
+      getDatasetsSummary.data && getDatasetsSummary.data?.datasets[0]?.resources.length === 0
           ? 'No Resources found. Please add to continue.'
           : '',
       errorType: 'critical',
@@ -207,9 +191,9 @@ const Page = () => {
       ? [
           {
             name: 'Access Type',
-            data: data?.datasets[0]?.accessModels,
+            data: getDatasetsSummary.data?.datasets[0]?.accessModels,
             error:
-              data && data?.datasets[0]?.accessModels.length === 0
+            getDatasetsSummary.data && getDatasetsSummary.data?.datasets[0]?.accessModels.length === 0
                 ? 'No Access Type found. Please add to continue.'
                 : '',
             errorType: 'critical',
@@ -218,18 +202,18 @@ const Page = () => {
       : []),
     {
       name: 'Metadata',
-      data: data?.datasets[0]?.metadata,
+      data: getDatasetsSummary.data?.datasets[0]?.metadata,
       error: '',
     },
   ];
 
   const PrimaryMetadata = [
-    { label: 'Dataset Name', value: data?.datasets[0].title },
-    { label: 'Description', value: data?.datasets[0].description },
-    { label: 'Date of Creation', value: formatDate(data?.datasets[0].created) },
+    { label: 'Dataset Name', value: getDatasetsSummary.data?.datasets[0].title },
+    { label: 'Description', value: getDatasetsSummary.data?.datasets[0].description },
+    { label: 'Date of Creation', value: formatDate(getDatasetsSummary.data?.datasets[0].created) },
     {
       label: 'Date of Last Update',
-      value: formatDate(data?.datasets[0].modified),
+      value: formatDate(getDatasetsSummary.data?.datasets[0].modified),
     },
   ];
   const router = useRouter();
@@ -269,7 +253,7 @@ const Page = () => {
           </Text>
         </div>
         <div className=" flex flex-col gap-10 pt-6">
-          {isLoading || mutationLoading ? (
+          {getDatasetsSummary.isLoading || mutationLoading ? (
             <div className=" mt-8 flex justify-center">
               <Spinner />
             </div>
@@ -356,7 +340,7 @@ const Page = () => {
                                 Tags:
                               </Text>
                               <div className="flex gap-2 lg:basis-4/5">
-                                {data?.datasets[0].tags.map(
+                                {getDatasetsSummary.data?.datasets[0].tags.map(
                                   (item: any, index: any) => (
                                     <Tag key={index}>{item.value}</Tag>
                                   )
@@ -373,9 +357,9 @@ const Page = () => {
               <Button
                 className="m-auto w-fit"
                 disabled={
-                  !data?.datasets[0]?.resources.length ||
+                  !getDatasetsSummary.data?.datasets[0]?.resources.length ||
                   (process.env.NEXT_PUBLIC_ENABLE_ACCESSMODEL === 'true' &&
-                    !data?.datasets[0]?.accessModels.length)
+                    !getDatasetsSummary.data?.datasets[0]?.accessModels.length)
                 }
                 onClick={() => mutate()}
               >
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/resources/components/query.ts b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/resources/components/query.ts
index d7b853af..b6baf349 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/resources/components/query.ts
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/dataset/[id]/edit/resources/components/query.ts
@@ -12,8 +12,8 @@ export const createResourceFilesDoc: any = graphql(`
 `);
 
 export const updateSchema: any = graphql(`
-  mutation updateSchema($input: SchemaUpdateInput!) {
-    updateSchema(input: $input) {
+  mutation updateSchema($schemaUpdateInput: SchemaUpdateInput!) {
+    updateFileResourceSchema(schemaUpdateInput: $schemaUpdateInput) {
       __typename
       ... on TypeResource {
         id
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx b/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx
index fd8d5b62..0c935b73 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/layout.tsx
@@ -72,7 +72,7 @@ export default function OrgDashboardLayout({ children }: DashboardLayoutProps) {
             href: '',
             label:
               (params.entityType === 'organization'
-                ? EntityDetailsQryRes.data?.organisations[0]
+                ? EntityDetailsQryRes.data?.organizations[0]
                 : EntityDetailsQryRes.data?.dataspaces[0]
               )?.name || params.entitySlug,
           },
@@ -88,7 +88,7 @@ export default function OrgDashboardLayout({ children }: DashboardLayoutProps) {
           items={orgSidebarNav}
           entityDetails={
             params.entityType === 'organization'
-              ? EntityDetailsQryRes.data?.organisations[0]
+              ? EntityDetailsQryRes.data?.organizations[0]
               : EntityDetailsQryRes.data?.dataspaces[0]
           }
         />
diff --git a/app/[locale]/dashboard/[entityType]/[entitySlug]/schema.ts b/app/[locale]/dashboard/[entityType]/[entitySlug]/schema.ts
index 1efc7801..0ff6c8e0 100644
--- a/app/[locale]/dashboard/[entityType]/[entitySlug]/schema.ts
+++ b/app/[locale]/dashboard/[entityType]/[entitySlug]/schema.ts
@@ -2,7 +2,7 @@ import { graphql } from '@/gql';
 
 export const getOrgDetailsQryDoc: any = graphql(`
   query getOrgDetailsQry($filters: OrganizationFilter) {
-    organisations(filters: $filters) {
+    organizations(filters: $filters) {
       id
       name
       logo {
diff --git a/app/[locale]/dashboard/[entityType]/page.tsx b/app/[locale]/dashboard/[entityType]/page.tsx
index 0b0d4db3..7c8b98de 100644
--- a/app/[locale]/dashboard/[entityType]/page.tsx
+++ b/app/[locale]/dashboard/[entityType]/page.tsx
@@ -73,17 +73,16 @@ const Page = () => {
         ) : (
           <div className={cn(styles.Main)}>
             <div className="flex flex-wrap  gap-24">
-              {[
-                ...(params.entityType === 'organization'
-                  ? allEntitiesList.data.organisations
-                  : allEntitiesList.data.dataspaces),
-              ]?.map((entityItem) => (
-                <EntityCard
-                  key={entityItem.slug}
-                  entityItem={entityItem}
-                  params={params}
-                />
-              ))}
+              {(params.entityType === 'organization'
+                ? allEntitiesList.data.organizations
+                : allEntitiesList.data.dataspaces
+              )?.map((entityItem: any) => {
+                return (
+                  <div key={entityItem.name}>
+                    <EntityCard entityItem={entityItem} params={params} />
+                  </div>
+                );
+              })}
               <div className="flex h-72 w-56 flex-col items-center justify-center gap-3 rounded-2 bg-baseGraySlateSolid6 p-4">
                 <Icon source={Icons.plus} size={40} color="success" />
                 <Text alignment="center" variant="headingMd">
@@ -100,18 +99,19 @@ const Page = () => {
 
 export default Page;
 
-const EntityCard = ({ key, entityItem, params }: any) => {
+const EntityCard = ({ entityItem, params }: any) => {
   const [isImageValid, setIsImageValid] = useState(() => {
-    return entityItem.logo ? true : false;
+    return entityItem?.logo ? true : false;
   });
+
   return (
     <div
-      key={key}
+      key={entityItem.name}
       className="flex h-72 w-56 flex-col items-center gap-3 rounded-2 border-2 border-solid border-baseGraySlateSolid4 px-4 py-5 text-center"
     >
       <div className="flex h-full w-full items-center justify-center rounded-2">
         <Link
-          href={`/dashboard/${params.entityType}/${entityItem.slug}/dataset`}
+          href={`/dashboard/${params.entityType}/${entityItem?.slug}/dataset`}
           id={entityItem.slug}
         >
           <div className="border-var(--border-radius-5) rounded-2">
@@ -119,7 +119,7 @@ const EntityCard = ({ key, entityItem, params }: any) => {
               <Image
                 height={160}
                 width={160}
-                src={`${process.env.NEXT_PUBLIC_BACKEND_URL}${entityItem.logo.url}`}
+                src={`${process.env.NEXT_PUBLIC_BACKEND_URL}/${entityItem?.logo.url}`}
                 alt={`${entityItem.name} logo`}
                 onError={() => {
                   setIsImageValid(false);
diff --git a/app/[locale]/dashboard/[entityType]/schema.ts b/app/[locale]/dashboard/[entityType]/schema.ts
index d448606c..a6145f1e 100644
--- a/app/[locale]/dashboard/[entityType]/schema.ts
+++ b/app/[locale]/dashboard/[entityType]/schema.ts
@@ -2,7 +2,7 @@ import { graphql } from '@/gql';
 
 export const allOrganizationsListingDoc: any = graphql(`
   query allOrganizationsListingDoc {
-    organisations {
+    organizations {
       id
       name
       logo {
diff --git a/app/[locale]/dashboard/components/dashboard-nav.tsx b/app/[locale]/dashboard/components/dashboard-nav.tsx
index a242d693..570d7e45 100644
--- a/app/[locale]/dashboard/components/dashboard-nav.tsx
+++ b/app/[locale]/dashboard/components/dashboard-nav.tsx
@@ -61,7 +61,7 @@ export function DashboardNav({
                 <Image
                   height={140}
                   width={140}
-                  src={`${process.env.NEXT_PUBLIC_BACKEND_URL}${entityDetails?.logo?.url}`}
+                  src={`${process.env.NEXT_PUBLIC_BACKEND_URL}/${entityDetails?.logo?.url}`}
                   alt={`${entityDetails?.name} logo`}
                   onError={() => {
                     setIsImageValid(false);