diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx
index cfa82a804..20c6193ff 100644
--- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx
+++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/dataset-groups/_PermissionDatasetGroups/PermissionListDatasetGroupContainer.tsx
@@ -31,7 +31,7 @@ export const PermissionListDatasetGroupContainer: React.FC<{
     });
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<ListDatasetGroupsResponse>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx
index dbed6b1df..06b2be80a 100644
--- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx
+++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/overview/_PermissionOverview/PermissionListUserContainer.tsx
@@ -19,7 +19,7 @@ export const PermissionListUserContainer: React.FC<{
 }> = React.memo(({ className = '', filteredUsers }) => {
   const numberOfUsers = filteredUsers.length;
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<DatasetPermissionOverviewUser>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionListPermissionGroupContainer.tsx b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionListPermissionGroupContainer.tsx
index bfc718025..06c84211c 100644
--- a/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionListPermissionGroupContainer.tsx
+++ b/apps/web/src/app/app/(primary_layout)/datasets/[datasetId]/permissions/permission-groups/_PermissionPermissionGroup/PermissionListPermissionGroupContainer.tsx
@@ -31,7 +31,7 @@ export const PermissionListPermissionGroupContainer: React.FC<{
     });
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<ListPermissionGroupsResponse>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/ListDatasetGroupsComponent.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/ListDatasetGroupsComponent.tsx
index e5b188efa..a2449e834 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/ListDatasetGroupsComponent.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/ListDatasetGroupsComponent.tsx
@@ -13,7 +13,7 @@ export const ListDatasetGroupsComponent: React.FC<{
   datasetGroups: DatasetGroup[];
   isFetched: boolean;
 }> = React.memo(({ datasetGroups, isFetched }) => {
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<DatasetGroup>[] = useMemo(
     () => [
       {
         title: 'Title',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx
index a30d2eeb5..c6e2c4545 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/datasets/DatasetGroupDatasetsListContainer.tsx
@@ -32,7 +32,7 @@ export const DatasetGroupDatasetsListContainer: React.FC<{
     });
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<GetDatasetGroupDatasetsResponse>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx
index dbe9758bd..45e0c2285 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/permission-groups/DatasetGroupPermissionGroupsListContainer.tsx
@@ -32,7 +32,7 @@ export const DatasetGroupPermissionGroupsListContainer: React.FC<{
     });
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<GetPermissionGroupDatasetGroupsResponse>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx
index b629022ac..83bf929cf 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/dataset-groups/[datasetGroupId]/users/DatasetGroupUsersListContainer.tsx
@@ -33,7 +33,7 @@ export const DatasetGroupUsersListContainer: React.FC<{
     });
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<GetPermissionGroupUsersResponse>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx
index 6af1cd7a8..09c6e3ea5 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/ListPermissionGroupsComponent.tsx
@@ -13,7 +13,7 @@ export const ListPermissionGroupsComponent: React.FC<{
   permissionGroups: ListPermissionGroupsResponse[];
   isFetched: boolean;
 }> = React.memo(({ permissionGroups, isFetched }) => {
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<ListPermissionGroupsResponse>[] = useMemo(
     () => [
       {
         title: 'Title',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx
index 7433f4756..ae144271d 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/dataset-groups/_PermissionGroupDatasetGroupsController/PermissionGroupDatasetsListContainer.tsx
@@ -27,7 +27,7 @@ export const PermissionGroupDatasetGroupsListContainer: React.FC<{
     await updatePermissionGroupDatasetGroups([params]);
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<GetPermissionGroupDatasetGroupsResponse>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx
index ee6c5cd70..318eed78b 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/datasets/_PermissionGroupDatasetsController/PermissionGroupDatasetsListContainer.tsx
@@ -32,7 +32,7 @@ export const PermissionGroupDatasetsListContainer: React.FC<{
     });
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<GetPermissionGroupDatasetsResponse>[] = useMemo(
     () => [
       {
         title: 'Name',
@@ -42,11 +42,11 @@ export const PermissionGroupDatasetsListContainer: React.FC<{
         title: 'Assigned',
         dataIndex: 'assigned',
         width: 130 + 85,
-        render: (assigned: boolean, permissionGroup: GetPermissionGroupUsersResponse) => {
+        render: (assigned, dataset: GetPermissionGroupDatasetsResponse) => {
           return (
             <div className="flex justify-end">
               <PermissionAssignedCell
-                id={permissionGroup.id}
+                id={dataset.id}
                 assigned={assigned}
                 text="assigned"
                 onSelect={onSelectAssigned}
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx
index 70cca1ffa..d8f830da3 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/permission-groups/[permissionGroupId]/users/_PermissionGroupUsersController/PermissionGroupUsersListContainer.tsx
@@ -28,7 +28,7 @@ export const PermissionGroupUsersListContainer: React.FC<{
     await updatePermissionGroupUsers([params]);
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<GetPermissionGroupUsersResponse>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/ListUsersComponent.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/ListUsersComponent.tsx
index d8ea40aba..36cfa0cda 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/ListUsersComponent.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/ListUsersComponent.tsx
@@ -18,7 +18,7 @@ export const ListUsersComponent: React.FC<{
   users: OrganizationUser[];
   isFetched: boolean;
 }> = React.memo(({ users, isFetched }) => {
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<OrganizationUser>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDatasetListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDatasetListContainer.tsx
index 6655ef24b..a2f6fa627 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDatasetListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/_overview/UserDatasetListContainer.tsx
@@ -12,7 +12,7 @@ import { Text } from '@/components/ui/typography';
 
 export const UserDatasetListContainer = React.memo(
   ({ filteredDatasets }: { filteredDatasets: OrganizationUserDataset[] }) => {
-    const columns: BusterListColumn[] = useMemo(
+    const columns: BusterListColumn<OrganizationUserDataset>[] = useMemo(
       () => [
         {
           title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesListContainer.tsx
index e1952ed8a..c9d1ca96c 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/attributes/UserAttributesListContainer.tsx
@@ -12,7 +12,7 @@ export const UserAttributesListContainer: React.FC<{
   filteredAttributes: BusterUserAttribute[];
   userId: string;
 }> = React.memo(({ filteredAttributes, userId }) => {
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<BusterUserAttribute>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupListContainer.tsx
index 3934d4cf6..fe4f9f993 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/dataset-groups/UserDatasetGroupListContainer.tsx
@@ -31,7 +31,7 @@ export const UserDatasetGroupListContainer: React.FC<{
     await updateUserDatasetGroups([params]);
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<BusterUserDatasetGroup>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx
index 82e69c4d5..14a11f7dd 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/datasets/UserDatasetsListContainer.tsx
@@ -28,7 +28,7 @@ export const UserDatasetsListContainer: React.FC<{
     await updateUserDatasets([params]);
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<BusterUserPermissionGroup>[] = useMemo(
     () => [
       {
         title: 'Name',
@@ -38,7 +38,7 @@ export const UserDatasetsListContainer: React.FC<{
         title: 'Assigned',
         dataIndex: 'assigned',
         width: 130,
-        render: (assigned: boolean, permissionGroup: BusterUserPermissionGroup) => {
+        render: (assigned, permissionGroup: BusterUserPermissionGroup) => {
           return (
             <div className="flex justify-end">
               <PermissionAssignedCell
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx
index ce91b2dc9..2bae9af1a 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/permission-groups/UserPermissionGroupsListContainer.tsx
@@ -31,7 +31,7 @@ export const UserPermissionGroupsListContainer: React.FC<{
     await updateUserPermissionGroups([params]);
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<BusterUserPermissionGroup>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsListContainer.tsx b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsListContainer.tsx
index 8a7b42c03..95237d6fa 100644
--- a/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsListContainer.tsx
+++ b/apps/web/src/app/app/(settings_layout)/settings/(permissions)/users/[userId]/teams/UserTeamsListContainer.tsx
@@ -31,7 +31,7 @@ export const UserTeamsListContainer: React.FC<{
     await updateUserTeams([params]);
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<BusterUserTeamListItem>[] = useMemo(
     () => [
       {
         title: 'Name',
@@ -39,9 +39,9 @@ export const UserTeamsListContainer: React.FC<{
       },
       {
         title: 'Role',
-        dataIndex: 'assigned',
+        dataIndex: 'role',
         width: 285,
-        render: (assigned: boolean, permissionGroup: BusterUserTeamListItem) => {
+        render: (_, permissionGroup) => {
           const { user_count, id, role } = permissionGroup;
           return (
             <div className="flex justify-end">
diff --git a/apps/web/src/controllers/ChatsListController/ChatItemsContainer.tsx b/apps/web/src/controllers/ChatsListController/ChatItemsContainer.tsx
index 94f9eb6b5..b2f4d673c 100644
--- a/apps/web/src/controllers/ChatsListController/ChatItemsContainer.tsx
+++ b/apps/web/src/controllers/ChatsListController/ChatItemsContainer.tsx
@@ -66,10 +66,10 @@ export const ChatItemsContainer: React.FC<{
     });
   }, [logsRecord]);
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<ChatListItem>[] = useMemo(
     () => [
       {
-        dataIndex: 'name',
+        dataIndex: 'title',
         title: 'Name',
         render: (name, record) => <TitleCell name={name} chatId={record?.id} />
       },
diff --git a/apps/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx b/apps/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx
index fc310fce9..63133a79c 100644
--- a/apps/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx
+++ b/apps/web/src/controllers/CollectionIndividualController/CollectionIndividualContent.tsx
@@ -63,11 +63,11 @@ export const CollectionIndividualContent: React.FC<{
 });
 CollectionIndividualContent.displayName = 'CollectionIndividualContent';
 
-const columns: BusterListColumn[] = [
+const columns: BusterListColumn<BusterCollectionItemAsset>[] = [
   {
     dataIndex: 'name',
     title: 'Title',
-    render: ({ asset_type, name }) => {
+    render: (_, { asset_type, name }) => {
       const Icon = CollectionIconRecord[asset_type];
       return (
         <div className="flex w-full items-center space-x-2 overflow-hidden">
@@ -95,7 +95,7 @@ const columns: BusterListColumn[] = [
     dataIndex: 'created_by',
     title: 'Owner',
     width: 50,
-    render: (created_by: BusterCollectionListItem['owner']) => {
+    render: (_, { created_by }) => {
       return (
         <Avatar image={created_by?.avatar_url || undefined} name={created_by?.name} size={18} />
       );
diff --git a/apps/web/src/controllers/CollectionListController/CollectionsListContent.tsx b/apps/web/src/controllers/CollectionListController/CollectionsListContent.tsx
index abdf7b422..3afd8c7ae 100644
--- a/apps/web/src/controllers/CollectionListController/CollectionsListContent.tsx
+++ b/apps/web/src/controllers/CollectionListController/CollectionsListContent.tsx
@@ -52,7 +52,7 @@ export const CollectionsListContent: React.FC<{
 );
 CollectionsListContent.displayName = 'CollectionsListContent';
 
-const columns: BusterListColumn[] = [
+const columns: BusterListColumn<BusterCollectionListItem>[] = [
   {
     dataIndex: 'name',
     title: 'Title',
diff --git a/apps/web/src/controllers/DashboardListController/DashboardListContent.tsx b/apps/web/src/controllers/DashboardListController/DashboardListContent.tsx
index 5317c56e5..8a76da46c 100644
--- a/apps/web/src/controllers/DashboardListController/DashboardListContent.tsx
+++ b/apps/web/src/controllers/DashboardListController/DashboardListContent.tsx
@@ -18,7 +18,7 @@ import { formatDate } from '@/lib';
 import { BusterRoutes, createBusterRoute } from '@/routes';
 import { DashboardSelectedOptionPopup } from './DashboardSelectedPopup';
 
-const columns: BusterListColumn[] = [
+const columns: BusterListColumn<BusterDashboardListItem>[] = [
   {
     dataIndex: 'name',
     title: 'Title',
@@ -51,7 +51,7 @@ const columns: BusterListColumn[] = [
     render: (data) => formatDate({ date: data, format: 'lll' })
   },
   {
-    dataIndex: 'sharing',
+    dataIndex: 'status',
     title: 'Sharing',
     width: 65,
     render: (_, data) => getShareStatus(data)
diff --git a/apps/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx b/apps/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx
index 72a0d6339..ed16ad271 100644
--- a/apps/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx
+++ b/apps/web/src/controllers/DatasetPermissionUser/PermissionListUsersContainer.tsx
@@ -31,7 +31,7 @@ export const PermissionListUsersContainer: React.FC<{
     updatePermissionUsers([params]);
   });
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<ListPermissionUsersResponse>[] = useMemo(
     () => [
       {
         title: 'Name',
diff --git a/apps/web/src/controllers/DatasetsListController/DatasetListContent.tsx b/apps/web/src/controllers/DatasetsListController/DatasetListContent.tsx
index 5c75226cc..9b4922255 100644
--- a/apps/web/src/controllers/DatasetsListController/DatasetListContent.tsx
+++ b/apps/web/src/controllers/DatasetsListController/DatasetListContent.tsx
@@ -15,7 +15,7 @@ import { formatDate } from '@/lib';
 import { BUSTER_DOCS_QUICKSTART, BusterRoutes, createBusterRoute } from '@/routes';
 import { DatasetSelectedOptionPopup } from './DatasetSelectedPopup';
 
-const columns: BusterListColumn[] = [
+const columns: BusterListColumn<BusterDatasetListItem>[] = [
   {
     title: 'Title',
     dataIndex: 'name'
@@ -34,8 +34,9 @@ const columns: BusterListColumn[] = [
   },
   {
     title: 'Data source',
-    dataIndex: 'data_source.name',
-    width: 105
+    dataIndex: 'data_source',
+    width: 105,
+    render: (v) => v?.name
   },
   {
     title: 'Status',
@@ -45,7 +46,7 @@ const columns: BusterListColumn[] = [
   },
   {
     title: 'Owner',
-    dataIndex: 'created_by_name',
+    dataIndex: 'owner',
     width: 60,
     render: (_, dataset: BusterDatasetListItem) => (
       <div className="flex w-full justify-start">
diff --git a/apps/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx b/apps/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx
index f6e860884..648a5b76f 100644
--- a/apps/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx
+++ b/apps/web/src/controllers/MetricListContainer/MetricItemsContainer.tsx
@@ -60,7 +60,7 @@ export const MetricItemsContainer: React.FC<{
     });
   }, [logsRecord]);
 
-  const columns: BusterListColumn[] = useMemo(
+  const columns: BusterListColumn<BusterMetricListItem>[] = useMemo(
     () => [
       {
         dataIndex: 'name',
diff --git a/apps/web/src/controllers/TermsListController/TermsListController.tsx b/apps/web/src/controllers/TermsListController/TermsListController.tsx
index d1ad39918..633385ef1 100644
--- a/apps/web/src/controllers/TermsListController/TermsListController.tsx
+++ b/apps/web/src/controllers/TermsListController/TermsListController.tsx
@@ -16,7 +16,7 @@ import { formatDate } from '@/lib/date';
 import { BusterRoutes, createBusterRoute } from '@/routes';
 import { TermListSelectedOptionPopup } from './TermListSelectedPopup';
 
-const columns: BusterListColumn[] = [
+const columns: BusterListColumn<BusterTermListItem>[] = [
   {
     dataIndex: 'name',
     title: 'Term'
@@ -28,13 +28,13 @@ const columns: BusterListColumn[] = [
     render: (data) => formatDate({ date: data, format: 'lll' })
   },
   {
-    dataIndex: 'created_at',
-    title: 'Created at',
+    dataIndex: 'last_edited',
+    title: 'Last edited',
     width: 140,
     render: (data) => formatDate({ date: data, format: 'lll' })
   },
   {
-    dataIndex: 'owner',
+    dataIndex: 'created_by',
     title: 'Owner',
     width: 60,
     render: (_, data: BusterTermListItem) => <Avatar name={data.created_by.name} size={18} />
diff --git a/packages/server-shared/src/chats/chat-list.types.ts b/packages/server-shared/src/chats/chat-list.types.ts
index 70dbb0bf6..e468ed6f0 100644
--- a/packages/server-shared/src/chats/chat-list.types.ts
+++ b/packages/server-shared/src/chats/chat-list.types.ts
@@ -15,6 +15,7 @@ export const ChatListItemSchema = z.object({
   latest_file_type: z.enum(['metric', 'dashboard']),
   latest_version_number: z.number().optional(),
   latest_file_name: z.string().nullable(),
+  is_shared: z.boolean(),
 });
 
 export type ChatListItem = z.infer<typeof ChatListItemSchema>;