diff --git a/apps/studio/components/grid/SupabaseGrid.utils.ts b/apps/studio/components/grid/SupabaseGrid.utils.ts
index f0d1b815593..bf99076c468 100644
--- a/apps/studio/components/grid/SupabaseGrid.utils.ts
+++ b/apps/studio/components/grid/SupabaseGrid.utils.ts
@@ -1,7 +1,8 @@
 import AwesomeDebouncePromise from 'awesome-debounce-promise'
 import { STORAGE_KEY_PREFIX } from './constants'
 import { InitialStateType } from './store/reducers'
-import { Dictionary, Sort, SupabaseGridProps, SupaColumn, SupaTable } from './types'
+import { Sort, SupabaseGridProps, SupaColumn, SupaTable } from './types'
+import type { Dictionary } from 'types'
 import { getGridColumns } from './utils/gridColumns'
 import { FilterOperatorOptions } from './components/header/filter'
 import { Filter } from 'components/grid/types'
diff --git a/apps/studio/components/grid/query/Query.utils.ts b/apps/studio/components/grid/query/Query.utils.ts
index cfb06617751..891af809b7b 100644
--- a/apps/studio/components/grid/query/Query.utils.ts
+++ b/apps/studio/components/grid/query/Query.utils.ts
@@ -1,5 +1,6 @@
 import { ident, literal, format } from '@scaleleap/pg-format'
-import { Dictionary, Filter, QueryPagination, QueryTable, Sort } from '../types'
+import { Filter, QueryPagination, QueryTable, Sort } from '../types'
+import type { Dictionary } from 'types'
 
 export function countQuery(
   table: QueryTable,
diff --git a/apps/studio/components/grid/query/QueryAction.ts b/apps/studio/components/grid/query/QueryAction.ts
index 4689ad68cbf..3646e2cb836 100644
--- a/apps/studio/components/grid/query/QueryAction.ts
+++ b/apps/studio/components/grid/query/QueryAction.ts
@@ -1,4 +1,5 @@
-import { Dictionary, QueryTable } from '../types'
+import { QueryTable } from '../types'
+import type { Dictionary } from 'types'
 import { IQueryFilter, QueryFilter } from './QueryFilter'
 
 export interface IQueryAction {
diff --git a/apps/studio/components/grid/query/QueryFilter.ts b/apps/studio/components/grid/query/QueryFilter.ts
index e266ff3d21a..f92fbd93493 100644
--- a/apps/studio/components/grid/query/QueryFilter.ts
+++ b/apps/studio/components/grid/query/QueryFilter.ts
@@ -1,4 +1,5 @@
-import { Dictionary, Filter, FilterOperator, QueryTable, Sort } from '../types'
+import { Filter, FilterOperator, QueryTable, Sort } from '../types'
+import type { Dictionary } from 'types'
 import { IQueryModifier, QueryModifier } from './QueryModifier'
 
 export interface IQueryFilter {
diff --git a/apps/studio/components/grid/query/QueryModifier.ts b/apps/studio/components/grid/query/QueryModifier.ts
index e9feffb1d2b..d9cced581ef 100644
--- a/apps/studio/components/grid/query/QueryModifier.ts
+++ b/apps/studio/components/grid/query/QueryModifier.ts
@@ -1,4 +1,5 @@
-import { Dictionary, Filter, QueryPagination, QueryTable, Sort } from '../types'
+import type { Dictionary } from 'types'
+import { Filter, QueryPagination, QueryTable, Sort } from '../types'
 import {
   countQuery,
   deleteQuery,
diff --git a/apps/studio/components/grid/store/reducers/row.ts b/apps/studio/components/grid/store/reducers/row.ts
index 81df9400eb6..637b4852388 100644
--- a/apps/studio/components/grid/store/reducers/row.ts
+++ b/apps/studio/components/grid/store/reducers/row.ts
@@ -1,6 +1,5 @@
-import update from 'immutability-helper'
 import { TOTAL_ROWS_INITIAL, TOTAL_ROWS_RESET } from '../../constants'
-import { Dictionary, SupaRow } from '../../types'
+import { SupaRow } from '../../types'
 import { INIT_ACTIONTYPE } from './base'
 
 export interface RowInitialState {
diff --git a/apps/studio/components/grid/types/base.ts b/apps/studio/components/grid/types/base.ts
index 698cd25f9e0..347bf3d6756 100644
--- a/apps/studio/components/grid/types/base.ts
+++ b/apps/studio/components/grid/types/base.ts
@@ -1,9 +1,5 @@
 import { CalculatedColumn, RenderHeaderCellProps } from 'react-data-grid'
 
-export interface Dictionary<T> {
-  [Key: string]: T
-}
-
 export interface Sort {
   column: string
   ascending?: boolean
diff --git a/apps/studio/components/grid/types/table.ts b/apps/studio/components/grid/types/table.ts
index 956a3a8affd..9d28f1fcd32 100644
--- a/apps/studio/components/grid/types/table.ts
+++ b/apps/studio/components/grid/types/table.ts
@@ -1,4 +1,5 @@
-import { Dictionary, GridForeignKey } from './base'
+import { GridForeignKey } from './base'
+import type { Dictionary } from 'types'
 
 export interface SupaColumn {
   readonly dataType: string
diff --git a/apps/studio/components/interfaces/Database/Functions/CreateFunction.tsx b/apps/studio/components/interfaces/Database/Functions/CreateFunction.tsx
index d18ffdf5db3..498a5162331 100644
--- a/apps/studio/components/interfaces/Database/Functions/CreateFunction.tsx
+++ b/apps/studio/components/interfaces/Database/Functions/CreateFunction.tsx
@@ -5,7 +5,7 @@ import { FormEvent, createContext, useContext, useEffect, useState } from 'react
 import toast from 'react-hot-toast'
 import { Button, IconPlus, IconTrash, Input, Listbox, Modal, Radio, SidePanel, Toggle } from 'ui'
 
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { POSTGRES_DATA_TYPES } from 'components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.constants'
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
 import ConfirmationModal from 'components/ui/ConfirmationModal'
diff --git a/apps/studio/components/interfaces/Database/Functions/Functions.utils.ts b/apps/studio/components/interfaces/Database/Functions/Functions.utils.ts
index 5c09aa3d99c..ea3b07a4131 100644
--- a/apps/studio/components/interfaces/Database/Functions/Functions.utils.ts
+++ b/apps/studio/components/interfaces/Database/Functions/Functions.utils.ts
@@ -1,4 +1,4 @@
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { isEmpty } from 'lodash'
 
 /**
diff --git a/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx b/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx
index 9a3e3e2d9ae..d73e2e89030 100644
--- a/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/ChooseFunctionForm.tsx
@@ -6,7 +6,6 @@ import { useRouter } from 'next/router'
 import { useState } from 'react'
 import { Button, IconChevronDown, IconHelpCircle, IconTerminal, SidePanel } from 'ui'
 
-import { Dictionary } from 'components/grid'
 import ProductEmptyState from 'components/to-be-cleaned/ProductEmptyState'
 import InformationBox from 'components/ui/InformationBox'
 import SqlEditor from 'components/ui/SqlEditor'
diff --git a/apps/studio/components/interfaces/Database/Triggers/CreateTrigger.tsx b/apps/studio/components/interfaces/Database/Triggers/CreateTrigger.tsx
index 6fe3278e47f..0ff14b3e5c4 100644
--- a/apps/studio/components/interfaces/Database/Triggers/CreateTrigger.tsx
+++ b/apps/studio/components/interfaces/Database/Triggers/CreateTrigger.tsx
@@ -6,7 +6,7 @@ import { createContext, useContext, useEffect, useState } from 'react'
 import toast from 'react-hot-toast'
 import SVG from 'react-inlinesvg'
 
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
 import ConfirmationModal from 'components/ui/ConfirmationModal'
 import FormEmptyBox from 'components/ui/FormBoxEmpty'
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.constants.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.constants.ts
index 16c4174ddee..434a83f28c3 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.constants.ts
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.constants.ts
@@ -1,4 +1,4 @@
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { Suggestion } from './ColumnEditor.types'
 
 const defaultTimeBasedExpressions: Suggestion[] = [
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
index bf57225add1..f614b126470 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.tsx
@@ -17,7 +17,7 @@ import {
   Toggle,
 } from 'ui'
 
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
 import { FormSection, FormSectionContent, FormSectionLabel } from 'components/ui/Forms'
 import { useForeignKeyConstraintsQuery } from 'data/database/foreign-key-constraints-query'
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
index c60a33903d8..a28841cf8d9 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ColumnEditor/ColumnEditor.utils.ts
@@ -1,5 +1,5 @@
 import { find, isUndefined, isEqual, isNull } from 'lodash'
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import type {
   PostgresColumn,
   PostgresRelationship,
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx
index 60994455d69..fca2d9f0822 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/ForeignKeySelector/ForeignKeySelector.tsx
@@ -2,7 +2,7 @@ import type { PostgresColumn, PostgresSchema, PostgresTable } from '@supabase/po
 import { find, get, isEmpty, sortBy } from 'lodash'
 import { useEffect, useState } from 'react'
 
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
 import InformationBox from 'components/ui/InformationBox'
 import { FOREIGN_KEY_CASCADE_ACTION } from 'data/database/database-query-constants'
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/DrilldownViewer/DrilldownPane.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/DrilldownViewer/DrilldownPane.tsx
index 5878212e0f6..da215279651 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/DrilldownViewer/DrilldownPane.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/DrilldownViewer/DrilldownPane.tsx
@@ -1,7 +1,7 @@
 import { isNull, noop } from 'lodash'
 import { IconChevronRight } from 'ui'
 
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 
 interface DrilldownPaneProps {
   pane: number
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/DrilldownViewer/DrilldownViewer.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/DrilldownViewer/DrilldownViewer.tsx
index 6ec207a9bf2..8fda83bfecf 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/DrilldownViewer/DrilldownViewer.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/JsonEditor/DrilldownViewer/DrilldownViewer.tsx
@@ -1,7 +1,7 @@
 import { isEmpty, last } from 'lodash'
 import { useState } from 'react'
 
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import DrilldownBreadCrumbs from './DrilldownBreadCrumbs'
 import DrilldownPane from './DrilldownPane'
 
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.tsx
index 44b7d534c74..130f824cd87 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.tsx
@@ -1,5 +1,5 @@
 import type { PostgresTable } from '@supabase/postgres-meta'
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { isEmpty, isUndefined, noop, partition } from 'lodash'
 import { useEffect, useMemo, useState } from 'react'
 import { SidePanel } from 'ui'
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts
index 7719f5b061e..b94520ec195 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.utils.ts
@@ -1,5 +1,5 @@
 import type { PostgresTable } from '@supabase/postgres-meta'
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import dayjs from 'dayjs'
 import { compact, find, isEqual, isNull, isString, isUndefined, omitBy } from 'lodash'
 
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx
index ea0c3ba98cd..d70f71d0854 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx
@@ -5,7 +5,7 @@ import { useState } from 'react'
 import { toast } from 'react-hot-toast'
 import { Modal } from 'ui'
 
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
 import ConfirmationModal from 'components/ui/ConfirmationModal'
 import { entityTypeKeys } from 'data/entity-types/keys'
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.types.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.types.ts
index d1ebbd3c11f..553a1dfa6c9 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.types.ts
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SpreadsheetImport/SpreadsheetImport.types.ts
@@ -1,4 +1,4 @@
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 
 export interface SpreadsheetData {
   headers: string[]
diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.types.ts b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.types.ts
index 57bb5e9a379..18cd6f1f87c 100644
--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.types.ts
+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/TableEditor/TableEditor.types.ts
@@ -1,4 +1,4 @@
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { ColumnField } from '../SidePanelEditor.types'
 
 export interface TableField {
diff --git a/apps/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
index 2f38d5a4cae..066b61ce373 100644
--- a/apps/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/TableGridEditor.tsx
@@ -7,7 +7,8 @@ import { observer } from 'mobx-react-lite'
 import { useRouter } from 'next/router'
 import { useEffect, useState } from 'react'
 
-import { Dictionary, parseSupaTable, SupabaseGrid, SupaTable } from 'components/grid'
+import { parseSupaTable, SupabaseGrid, SupaTable } from 'components/grid'
+import { Dictionary } from 'types'
 import { ERROR_PRIMARY_KEY_NOTFOUND } from 'components/grid/constants'
 import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
 import Connecting from 'components/ui/Loading/Loading'
diff --git a/apps/studio/components/to-be-cleaned/Charts/ChartHandler.tsx b/apps/studio/components/to-be-cleaned/Charts/ChartHandler.tsx
index 4ec7435dd11..ca155ac2572 100644
--- a/apps/studio/components/to-be-cleaned/Charts/ChartHandler.tsx
+++ b/apps/studio/components/to-be-cleaned/Charts/ChartHandler.tsx
@@ -1,4 +1,4 @@
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { isUndefined } from 'lodash'
 import { useRouter } from 'next/router'
 import { PropsWithChildren, useEffect, useState } from 'react'
diff --git a/apps/studio/components/to-be-cleaned/Integration/Vercel.utils.ts b/apps/studio/components/to-be-cleaned/Integration/Vercel.utils.ts
index be67f97da8c..ba2af99b6d5 100644
--- a/apps/studio/components/to-be-cleaned/Integration/Vercel.utils.ts
+++ b/apps/studio/components/to-be-cleaned/Integration/Vercel.utils.ts
@@ -1,6 +1,6 @@
 import { post, get } from 'lib/common/fetch'
 import { INTEGRATION_ENVS_ALIAS } from 'lib/vercelConfigs'
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import { API_URL } from 'lib/constants'
 
 export async function fetchVercelProjects({
diff --git a/apps/studio/data/database-functions/database-functions-create-mutation.ts b/apps/studio/data/database-functions/database-functions-create-mutation.ts
index 55ebf4460e1..0e75b1b1101 100644
--- a/apps/studio/data/database-functions/database-functions-create-mutation.ts
+++ b/apps/studio/data/database-functions/database-functions-create-mutation.ts
@@ -4,7 +4,7 @@ import { toast } from 'react-hot-toast'
 import { post } from 'data/fetchers'
 import { ResponseError } from 'types'
 import { databaseFunctionsKeys } from './keys'
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 
 export type DatabaseFunctionCreateVariables = {
   projectRef: string
diff --git a/apps/studio/data/database-functions/database-functions-update-mutation.ts b/apps/studio/data/database-functions/database-functions-update-mutation.ts
index ef6d63df4a7..b4ee2460b73 100644
--- a/apps/studio/data/database-functions/database-functions-update-mutation.ts
+++ b/apps/studio/data/database-functions/database-functions-update-mutation.ts
@@ -4,7 +4,7 @@ import { toast } from 'react-hot-toast'
 import { patch } from 'data/fetchers'
 import { ResponseError } from 'types'
 import { databaseFunctionsKeys } from './keys'
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 
 export type DatabaseFunctionUpdateVariables = {
   projectRef: string
diff --git a/apps/studio/data/table-rows/utils.ts b/apps/studio/data/table-rows/utils.ts
index 48aa9f38f13..55c6c305b07 100644
--- a/apps/studio/data/table-rows/utils.ts
+++ b/apps/studio/data/table-rows/utils.ts
@@ -2,7 +2,6 @@ import { Filter, ServiceError, SupaTable } from 'components/grid'
 import { ERROR_PRIMARY_KEY_NOTFOUND } from 'components/grid/constants'
 import { isNumericalColumn } from 'components/grid/utils'
 import { Table } from 'data/tables/table-query'
-import { TableLike } from 'hooks/misc/useTable'
 
 /**
  * temporary fix until we implement a better filter UI
diff --git a/apps/studio/pages/vercel/integrate.tsx b/apps/studio/pages/vercel/integrate.tsx
index 81a6fec6393..70d927ee5ce 100644
--- a/apps/studio/pages/vercel/integrate.tsx
+++ b/apps/studio/pages/vercel/integrate.tsx
@@ -6,7 +6,7 @@ import { useRouter } from 'next/router'
 import { ChangeEvent, createContext, useContext, useEffect, useState } from 'react'
 import { toast } from 'react-hot-toast'
 
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import VercelIntegrationLayout from 'components/layouts/VercelIntegrationLayout'
 import {
   createVercelEnv,
diff --git a/apps/studio/pages/vercel/setupProject.tsx b/apps/studio/pages/vercel/setupProject.tsx
index 34c74f20ecc..d83d87dec1a 100644
--- a/apps/studio/pages/vercel/setupProject.tsx
+++ b/apps/studio/pages/vercel/setupProject.tsx
@@ -7,7 +7,7 @@ import { ChangeEvent, createContext, useContext, useEffect, useRef, useState } f
 import { toast } from 'react-hot-toast'
 import { Button, Input, Listbox } from 'ui'
 
-import { Dictionary } from 'components/grid'
+import { Dictionary } from 'types'
 import VercelIntegrationLayout from 'components/layouts/VercelIntegrationLayout'
 import {
   createVercelEnv,
diff --git a/apps/studio/state/table-editor.tsx b/apps/studio/state/table-editor.tsx
index a792cadc1fc..3c2d33012b4 100644
--- a/apps/studio/state/table-editor.tsx
+++ b/apps/studio/state/table-editor.tsx
@@ -1,5 +1,6 @@
 import { PostgresColumn } from '@supabase/postgres-meta'
-import { Dictionary, SupaRow } from 'components/grid'
+import { SupaRow } from 'components/grid'
+import { Dictionary } from 'types'
 import { ForeignRowSelectorProps } from 'components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/ForeignRowSelector/ForeignRowSelector'
 import { JsonEditValue } from 'components/interfaces/TableGridEditor/SidePanelEditor/RowEditor/RowEditor.types'
 import { PropsWithChildren, createContext, useContext, useRef } from 'react'
diff --git a/apps/studio/stores/project/VaultStore.ts b/apps/studio/stores/project/VaultStore.ts
index 03aa9f72ab3..eedeb1f17f4 100644
--- a/apps/studio/stores/project/VaultStore.ts
+++ b/apps/studio/stores/project/VaultStore.ts
@@ -1,5 +1,5 @@
 import type { PostgresColumn } from '@supabase/postgres-meta'
-import { Query } from 'components/grid'
+import { Query } from 'components/grid/query/Query'
 import { makeAutoObservable } from 'mobx'
 import { SchemaView, VaultSecret } from 'types'
 import { IRootStore } from '../RootStore'
diff --git a/apps/studio/types/base.ts b/apps/studio/types/base.ts
index bdd2e85df49..373b42ace45 100644
--- a/apps/studio/types/base.ts
+++ b/apps/studio/types/base.ts
@@ -92,3 +92,6 @@ export interface ResponseError {
   message: string
   requestId?: string
 }
+export interface Dictionary<T> {
+  [Key: string]: T
+}