diff --git a/apps/console/src/pages/PeoplesPage.tsx b/apps/console/src/pages/PeoplesPage.tsx
index 778e1fee6..b292326a1 100644
--- a/apps/console/src/pages/PeoplesPage.tsx
+++ b/apps/console/src/pages/PeoplesPage.tsx
@@ -38,7 +38,7 @@ function PeoplesPageContent({
   queryRef: PreloadedQuery<PeoplesPageQueryType>;
 }) {
   const data = usePreloadedQuery(PeoplesPageQuery, queryRef);
-  const peoples = data.node?.peoples?.edges?.map(edge => edge?.node) ?? [];
+  const peoples = data.node.peoples?.edges.map(edge => edge?.node) ?? [];
 
   return (
     <div className="p-6 space-y-6">
diff --git a/apps/console/src/pages/VendorsPage.tsx b/apps/console/src/pages/VendorsPage.tsx
index 1cf12243b..2f849b66f 100644
--- a/apps/console/src/pages/VendorsPage.tsx
+++ b/apps/console/src/pages/VendorsPage.tsx
@@ -36,7 +36,7 @@ function VendorsPageContent({
   queryRef: PreloadedQuery<VendorsPageQueryType>;
 }) {
   const data = usePreloadedQuery(VendorsPageQuery, queryRef);
-  const vendors = data.node?.vendors?.edges?.map(edge => edge?.node) ?? [];
+  const vendors = data.node.vendors?.edges.map(edge => edge?.node) ?? [];
 
   return (
     <div className="p-6 space-y-6">
diff --git a/apps/console/src/pages/__generated__/FrameworksPageQuery.graphql.ts b/apps/console/src/pages/__generated__/FrameworksPageQuery.graphql.ts
new file mode 100644
index 000000000..e76fb6af3
--- /dev/null
+++ b/apps/console/src/pages/__generated__/FrameworksPageQuery.graphql.ts
@@ -0,0 +1,233 @@
+/**
+ * @generated SignedSource<<3bb5a1a7f62542ace96a9f256dada04e>>
+ * @lightSyntaxTransform
+ * @nogrep
+ */
+
+/* tslint:disable */
+/* eslint-disable */
+// @ts-nocheck
+
+import { ConcreteRequest } from 'relay-runtime';
+export type ControlState = "IMPLEMENTED" | "IN_PROGRESS" | "NOT_APPLICABLE" | "NOT_STARTED";
+export type FrameworksPageQuery$variables = Record<PropertyKey, never>;
+export type FrameworksPageQuery$data = {
+  readonly node: {
+    readonly frameworks?: {
+      readonly edges: ReadonlyArray<{
+        readonly node: {
+          readonly controls: {
+            readonly edges: ReadonlyArray<{
+              readonly node: {
+                readonly id: string;
+                readonly state: ControlState;
+              };
+            }>;
+          };
+          readonly createdAt: any;
+          readonly description: string;
+          readonly id: string;
+          readonly name: string;
+          readonly updatedAt: any;
+        };
+      }>;
+    };
+    readonly id: string;
+  };
+};
+export type FrameworksPageQuery = {
+  response: FrameworksPageQuery$data;
+  variables: FrameworksPageQuery$variables;
+};
+
+const node: ConcreteRequest = (function(){
+var v0 = [
+  {
+    "kind": "Literal",
+    "name": "id",
+    "value": "AZSfP_xAcAC5IAAAAAAltA"
+  }
+],
+v1 = {
+  "alias": null,
+  "args": null,
+  "kind": "ScalarField",
+  "name": "id",
+  "storageKey": null
+},
+v2 = {
+  "kind": "InlineFragment",
+  "selections": [
+    {
+      "alias": null,
+      "args": null,
+      "concreteType": "FrameworkConnection",
+      "kind": "LinkedField",
+      "name": "frameworks",
+      "plural": false,
+      "selections": [
+        {
+          "alias": null,
+          "args": null,
+          "concreteType": "FrameworkEdge",
+          "kind": "LinkedField",
+          "name": "edges",
+          "plural": true,
+          "selections": [
+            {
+              "alias": null,
+              "args": null,
+              "concreteType": "Framework",
+              "kind": "LinkedField",
+              "name": "node",
+              "plural": false,
+              "selections": [
+                (v1/*: any*/),
+                {
+                  "alias": null,
+                  "args": null,
+                  "kind": "ScalarField",
+                  "name": "name",
+                  "storageKey": null
+                },
+                {
+                  "alias": null,
+                  "args": null,
+                  "kind": "ScalarField",
+                  "name": "description",
+                  "storageKey": null
+                },
+                {
+                  "alias": null,
+                  "args": null,
+                  "concreteType": "ControlConnection",
+                  "kind": "LinkedField",
+                  "name": "controls",
+                  "plural": false,
+                  "selections": [
+                    {
+                      "alias": null,
+                      "args": null,
+                      "concreteType": "ControlEdge",
+                      "kind": "LinkedField",
+                      "name": "edges",
+                      "plural": true,
+                      "selections": [
+                        {
+                          "alias": null,
+                          "args": null,
+                          "concreteType": "Control",
+                          "kind": "LinkedField",
+                          "name": "node",
+                          "plural": false,
+                          "selections": [
+                            (v1/*: any*/),
+                            {
+                              "alias": null,
+                              "args": null,
+                              "kind": "ScalarField",
+                              "name": "state",
+                              "storageKey": null
+                            }
+                          ],
+                          "storageKey": null
+                        }
+                      ],
+                      "storageKey": null
+                    }
+                  ],
+                  "storageKey": null
+                },
+                {
+                  "alias": null,
+                  "args": null,
+                  "kind": "ScalarField",
+                  "name": "createdAt",
+                  "storageKey": null
+                },
+                {
+                  "alias": null,
+                  "args": null,
+                  "kind": "ScalarField",
+                  "name": "updatedAt",
+                  "storageKey": null
+                }
+              ],
+              "storageKey": null
+            }
+          ],
+          "storageKey": null
+        }
+      ],
+      "storageKey": null
+    }
+  ],
+  "type": "Organization",
+  "abstractKey": null
+};
+return {
+  "fragment": {
+    "argumentDefinitions": [],
+    "kind": "Fragment",
+    "metadata": null,
+    "name": "FrameworksPageQuery",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v0/*: any*/),
+        "concreteType": null,
+        "kind": "LinkedField",
+        "name": "node",
+        "plural": false,
+        "selections": [
+          (v1/*: any*/),
+          (v2/*: any*/)
+        ],
+        "storageKey": "node(id:\"AZSfP_xAcAC5IAAAAAAltA\")"
+      }
+    ],
+    "type": "Query",
+    "abstractKey": null
+  },
+  "kind": "Request",
+  "operation": {
+    "argumentDefinitions": [],
+    "kind": "Operation",
+    "name": "FrameworksPageQuery",
+    "selections": [
+      {
+        "alias": null,
+        "args": (v0/*: any*/),
+        "concreteType": null,
+        "kind": "LinkedField",
+        "name": "node",
+        "plural": false,
+        "selections": [
+          {
+            "alias": null,
+            "args": null,
+            "kind": "ScalarField",
+            "name": "__typename",
+            "storageKey": null
+          },
+          (v1/*: any*/),
+          (v2/*: any*/)
+        ],
+        "storageKey": "node(id:\"AZSfP_xAcAC5IAAAAAAltA\")"
+      }
+    ]
+  },
+  "params": {
+    "cacheID": "1c8d130ae8ef94afc7a59fae8ac71e39",
+    "id": null,
+    "metadata": {},
+    "name": "FrameworksPageQuery",
+    "operationKind": "query",
+    "text": "query FrameworksPageQuery {\n  node(id: \"AZSfP_xAcAC5IAAAAAAltA\") {\n    __typename\n    id\n    ... on Organization {\n      frameworks {\n        edges {\n          node {\n            id\n            name\n            description\n            controls {\n              edges {\n                node {\n                  id\n                  state\n                }\n              }\n            }\n            createdAt\n            updatedAt\n          }\n        }\n      }\n    }\n  }\n}\n"
+  }
+};
+})();
+
+(node as any).hash = "fda9662b311a83b144af3c11c573d634";
+
+export default node;