diff --git a/docs/docs/feature-library/custom-transfer-directory.md b/docs/docs/feature-library/custom-transfer-directory.md
index b4877c472..474628b0b 100644
--- a/docs/docs/feature-library/custom-transfer-directory.md
+++ b/docs/docs/feature-library/custom-transfer-directory.md
@@ -40,9 +40,11 @@ Enable the feature in the flex-config asset for your environment.
 ```javascript
 "custom_transfer_directory": {
   "enabled": true, // globally enable or disable the feature
+  "max_items": 200, // max number of items to show (search field allows accessing the remaining items)
   "worker" : {
     "enabled": true, // enable the custom worker tab
-    "show_only_available_workers": false
+    "show_only_available_workers": false,
+    "max_taskrouter_workers": 15000 // the maximum "Registered Workers per Workspace" (Max-Named-Workers-Count) value in the TaskRouter Limits section of Twilio Console; 15000 for most accounts.
   },
   "queue" : {
     "enabled": true, // enable the custom queue tab
diff --git a/flex-config/ui_attributes.common.json b/flex-config/ui_attributes.common.json
index ffa453e05..05a511101 100644
--- a/flex-config/ui_attributes.common.json
+++ b/flex-config/ui_attributes.common.json
@@ -205,9 +205,11 @@
       },
       "custom_transfer_directory": {
         "enabled": true,
+        "max_items": 200,
         "worker": {
           "enabled": true,
-          "show_only_available_workers": false
+          "show_only_available_workers": false,
+          "max_taskrouter_workers": 15000
         },
         "queue": {
           "enabled": true,
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/config.ts b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/config.ts
index f0a65f1a9..547defdc0 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/config.ts
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/config.ts
@@ -6,6 +6,7 @@ import CustomTransferDirectoryConfig from './types/ServiceConfiguration';
 
 const {
   enabled = false,
+  max_items = 200,
   queue: queue_config,
   worker: worker_config,
   external_directory: external_directory_config,
@@ -20,7 +21,11 @@ const {
   global_exclude_filter = '',
 } = queue_config || {};
 
-const { enabled: workerEnabled = false, show_only_available_workers = false } = worker_config || {};
+const {
+  enabled: workerEnabled = false,
+  show_only_available_workers = false,
+  max_taskrouter_workers = 15000,
+} = worker_config || {};
 
 const {
   enabled: externalDirectoryEnabled = false,
@@ -39,6 +44,10 @@ export const isFeatureEnabled = (): boolean => {
   return enabled;
 };
 
+export const getMaxItems = (): number => {
+  return max_items;
+};
+
 export const isCustomQueueTransferEnabled = (): boolean => {
   return isFeatureEnabled() && queueEnabled;
 };
@@ -102,6 +111,10 @@ export const showOnlyAvailableWorkers = (): boolean => {
   return show_only_available_workers;
 };
 
+export const getMaxTaskRouterWorkers = (): number => {
+  return max_taskrouter_workers;
+};
+
 export const isNativeDigitalXferEnabled = (): boolean => {
   return Manager.getInstance().store.getState().flex.featureFlags?.transfersConfig?.enabled === true;
 };
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/DirectoryItem.tsx b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/DirectoryItem.tsx
index 0ce9b4d37..1caa3bc92 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/DirectoryItem.tsx
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/DirectoryItem.tsx
@@ -1,9 +1,8 @@
-import * as React from 'react';
-import { TaskHelper, ITask, templates } from '@twilio/flex-ui';
+import React, { useState } from 'react';
+import { TaskHelper, ITask, styled, templates } from '@twilio/flex-ui';
 import { Box } from '@twilio-paste/core/box';
 import { ButtonGroup } from '@twilio-paste/core/button-group';
 import { Button } from '@twilio-paste/core/button';
-import { Flex } from '@twilio-paste/core/flex';
 import { Tooltip } from '@twilio-paste/core/tooltip';
 import { Text } from '@twilio-paste/core/text';
 import { AgentIcon } from '@twilio-paste/icons/esm/AgentIcon';
@@ -23,8 +22,17 @@ export interface DirectoryItemProps {
   onTransferClick: (options: any) => void;
 }
 
+const DirectoryItemContainer = styled('div')`
+  padding-inline: 0.5rem;
+  min-height: 40px;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+`;
+
 const DirectoryItem = (props: DirectoryItemProps) => {
   const { entry, task, onTransferClick } = props;
+  const [isHovered, setIsHovered] = useState(false);
 
   const onWarmTransferClick = () => {
     onTransferClick({ mode: 'WARM' });
@@ -36,7 +44,7 @@ const DirectoryItem = (props: DirectoryItemProps) => {
 
   const renderIcon = (): React.JSX.Element => {
     if (entry.icon) {
-      return entry.icon;
+      return entry.icon();
     }
 
     switch (entry.type) {
@@ -51,7 +59,9 @@ const DirectoryItem = (props: DirectoryItemProps) => {
 
   const renderLabel = (): React.JSX.Element => (
     <Box key={`directory-item-label-${entry.type}-${entry.key}`} element="TRANSFER_DIR_COMMON_ROW_LABEL">
-      {entry.labelComponent || (
+      {entry.labelComponent ? (
+        entry.labelComponent()
+      ) : (
         <Text as="div" className="Twilio" element="TRANSFER_DIR_COMMON_ROW_NAME">
           {entry.label}
         </Text>
@@ -60,16 +70,15 @@ const DirectoryItem = (props: DirectoryItemProps) => {
   );
 
   return (
-    <Flex
-      element="TRANSFER_DIR_COMMON_HORIZONTAL_ROW_CONTAINER"
-      vertical={false}
-      vAlignContent="center"
+    <DirectoryItemContainer
+      onMouseEnter={() => setIsHovered(true)}
+      onMouseLeave={() => setIsHovered(false)}
       key={`directory-item-container-${entry.type}-${entry.key}`}
     >
       <Box key={`directory-item-icon-${entry.type}-${entry.key}`} element="TRANSFER_DIR_COMMON_ROW_ICON">
         {renderIcon()}
       </Box>
-      {entry.tooltip ? (
+      {isHovered && entry.tooltip ? (
         <Tooltip
           key={`directory-item-label-tooltip-${entry.type}-${entry.key}`}
           element="TRANSFER_DIR_COMMON_TOOLTIP"
@@ -81,75 +90,73 @@ const DirectoryItem = (props: DirectoryItemProps) => {
         renderLabel()
       )}
 
-      <ButtonGroup
-        element="TRANSFER_DIR_COMMON_ROW_BUTTONGROUP"
-        key={`directory-item-buttongroup-${entry.type}-${entry.key}`}
-        attached
-      >
-        {entry.warm_transfer_enabled ? (
-          <Tooltip
-            key={`directory-item-buttons-warm-transfer-tooltip-${entry.type}-${entry.key}`}
-            element="TRANSFER_DIR_COMMON_TOOLTIP"
-            text={templates[StringTemplates.WarmTransfer]()}
-          >
-            <Button
-              element="TRANSFER_DIR_COMMON_ROW_BUTTON"
-              key={`directory-item-warm-transfer-button-${entry.type}-${entry.key}`}
-              variant="secondary_icon"
-              size="circle"
-              onClick={onWarmTransferClick}
+      {isHovered && (
+        <ButtonGroup key={`directory-item-buttongroup-${entry.type}-${entry.key}`} attached>
+          {entry.warm_transfer_enabled ? (
+            <Tooltip
+              key={`directory-item-buttons-warm-transfer-tooltip-${entry.type}-${entry.key}`}
+              element="TRANSFER_DIR_COMMON_TOOLTIP"
+              text={templates[StringTemplates.WarmTransfer]()}
             >
-              {task && TaskHelper.isChatBasedTask(task) ? (
-                <ChatIcon
-                  key={`directory-item-warm-transfer-icon-${entry.type}-${entry.key}`}
-                  decorative={false}
-                  title=""
-                />
-              ) : (
-                <CallTransferIcon
-                  key={`directory-item-warm-transfer-icon-${entry.type}-${entry.key}`}
-                  decorative={false}
-                  title=""
-                />
-              )}
-            </Button>
-          </Tooltip>
-        ) : (
-          <div></div>
-        )}
-        {entry.cold_transfer_enabled ? (
-          <Tooltip
-            key={`directory-item-buttons-cold-transfer-tooltip-${entry.type}-${entry.key}`}
-            element="TRANSFER_DIR_COMMON_TOOLTIP"
-            text={templates[StringTemplates.ColdTransfer]()}
-          >
-            <Button
-              element="TRANSFER_DIR_COMMON_ROW_BUTTON"
-              key={`directory-item-warm-transfer-button-${entry.type}-${entry.key}`}
-              variant="secondary_icon"
-              size="circle"
-              onClick={onColdTransferClick}
+              <Button
+                element="TRANSFER_DIR_COMMON_ROW_BUTTON"
+                key={`directory-item-warm-transfer-button-${entry.type}-${entry.key}`}
+                variant="secondary_icon"
+                size="circle"
+                onClick={onWarmTransferClick}
+              >
+                {task && TaskHelper.isChatBasedTask(task) ? (
+                  <ChatIcon
+                    key={`directory-item-warm-transfer-icon-${entry.type}-${entry.key}`}
+                    decorative={false}
+                    title=""
+                  />
+                ) : (
+                  <CallTransferIcon
+                    key={`directory-item-warm-transfer-icon-${entry.type}-${entry.key}`}
+                    decorative={false}
+                    title=""
+                  />
+                )}
+              </Button>
+            </Tooltip>
+          ) : (
+            <div></div>
+          )}
+          {entry.cold_transfer_enabled ? (
+            <Tooltip
+              key={`directory-item-buttons-cold-transfer-tooltip-${entry.type}-${entry.key}`}
+              element="TRANSFER_DIR_COMMON_TOOLTIP"
+              text={templates[StringTemplates.ColdTransfer]()}
             >
-              {task && TaskHelper.isChatBasedTask(task) ? (
-                <SendIcon
-                  key={`directory-item-cold-transfer-icon-${entry.type}-${entry.key}`}
-                  decorative={false}
-                  title=""
-                />
-              ) : (
-                <CallOutgoingIcon
-                  key={`directory-item-cold-transfer-icon-${entry.type}-${entry.key}`}
-                  decorative={false}
-                  title=""
-                />
-              )}
-            </Button>
-          </Tooltip>
-        ) : (
-          <div></div>
-        )}
-      </ButtonGroup>
-    </Flex>
+              <Button
+                element="TRANSFER_DIR_COMMON_ROW_BUTTON"
+                key={`directory-item-warm-transfer-button-${entry.type}-${entry.key}`}
+                variant="secondary_icon"
+                size="circle"
+                onClick={onColdTransferClick}
+              >
+                {task && TaskHelper.isChatBasedTask(task) ? (
+                  <SendIcon
+                    key={`directory-item-cold-transfer-icon-${entry.type}-${entry.key}`}
+                    decorative={false}
+                    title=""
+                  />
+                ) : (
+                  <CallOutgoingIcon
+                    key={`directory-item-cold-transfer-icon-${entry.type}-${entry.key}`}
+                    decorative={false}
+                    title=""
+                  />
+                )}
+              </Button>
+            </Tooltip>
+          ) : (
+            <div></div>
+          )}
+        </ButtonGroup>
+      )}
+    </DirectoryItemContainer>
   );
 };
 
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/DirectoryTab.tsx b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/DirectoryTab.tsx
index 2991025ec..597147679 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/DirectoryTab.tsx
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/DirectoryTab.tsx
@@ -1,7 +1,9 @@
 import { Alert } from '@twilio-paste/core/alert';
+import { Button } from '@twilio-paste/core/button';
 import { Flex } from '@twilio-paste/core/flex';
 import { Spinner } from '@twilio-paste/core/spinner';
-import { withTaskContext, ITask, Actions, Template, templates } from '@twilio/flex-ui';
+import { LoadingIcon } from '@twilio-paste/icons/esm/LoadingIcon';
+import { withTaskContext, ITask, Actions, styled, Template, templates } from '@twilio/flex-ui';
 import { useState, useRef, useEffect } from 'react';
 import debounce from 'lodash/debounce';
 
@@ -9,6 +11,7 @@ import DirectoryItem from './DirectoryItem';
 import SearchBox from './SearchBox';
 import { StringTemplates } from '../flex-hooks/strings/CustomTransferDirectory';
 import { DirectoryEntry } from '../types/DirectoryEntry';
+import { getMaxItems } from '../config';
 
 export interface TransferClickPayload {
   mode: 'WARM' | 'COLD';
@@ -20,8 +23,18 @@ export interface OwnProps {
   isLoading: boolean;
   noEntriesMessage?: string;
   onTransferClick: (entry: DirectoryEntry, transferOptions: TransferClickPayload) => void;
+  onReloadClick?: () => void;
 }
 
+const SearchRow = styled('div')`
+  display: flex;
+  align-items: center;
+  column-gap: 1rem;
+  padding: 1rem;
+  padding-top: 1.25rem;
+  width: 100%;
+`;
+
 const DirectoryTab = (props: OwnProps) => {
   const [filteredDirectory, setFilteredDirectory] = useState([] as Array<DirectoryEntry>);
 
@@ -58,7 +71,14 @@ const DirectoryTab = (props: OwnProps) => {
 
   return (
     <Flex key="external-directory-tab-list" vertical wrap={false} grow={1} shrink={1}>
-      <SearchBox key="key-tab-search-box" onInputChange={onQueueSearchInputChange} inputRef={searchInputRef} />
+      <SearchRow key="search-row">
+        <SearchBox key="key-tab-search-box" onInputChange={onQueueSearchInputChange} inputRef={searchInputRef} />
+        {props.onReloadClick && (
+          <Button variant="secondary" onClick={props.onReloadClick}>
+            <LoadingIcon decorative={false} title={templates[StringTemplates.UpdateList]()} />
+          </Button>
+        )}
+      </SearchRow>
       <Flex key="external-tab-results" vertical element="TRANSFER_DIR_COMMON_ROWS_CONTAINER">
         {props.isLoading && (
           <Flex hAlignContent="center">
@@ -76,7 +96,9 @@ const DirectoryTab = (props: OwnProps) => {
             />
           </Alert>
         ) : (
-          Array.from(filteredDirectory).map((entry: DirectoryEntry) => {
+          !props.isLoading &&
+          Array.from(filteredDirectory).map((entry, index) => {
+            if (index >= getMaxItems()) return null;
             return (
               <DirectoryItem
                 task={props.task}
@@ -87,6 +109,11 @@ const DirectoryTab = (props: OwnProps) => {
             );
           })
         )}
+        {filteredDirectory.length > getMaxItems() && (
+          <Alert variant="neutral">
+            <Template source={templates[StringTemplates.MoreItems]} />
+          </Alert>
+        )}
       </Flex>
     </Flex>
   );
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/QueueDirectoryTab.tsx b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/QueueDirectoryTab.tsx
index 65d8b8ac5..87f57bd4c 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/QueueDirectoryTab.tsx
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/QueueDirectoryTab.tsx
@@ -138,30 +138,6 @@ const QueueDirectoryTab = (props: OwnProps) => {
     // make sure all queues are loaded
     const insightQueues = await getAllSyncMapItems(queueMap.current);
 
-    // update the queue item
-    queueMap.current.on('itemUpdated', (updatedItem) => {
-      const {
-        item: { key, data },
-      } = updatedItem;
-
-      const queue = transferQueues.current.find((transferQueue) => transferQueue.sid === key);
-      if (queue && data) {
-        mapRealTimeDataToTransferQueueItem(queue, data as IRealTimeQueueData);
-      }
-
-      filterQueues();
-    });
-
-    // if a queue is added trigger a reload
-    queueMap.current.on('itemAdded', () => {
-      fetchSDKTaskQueues();
-    });
-
-    // if a queue is removed trigger a reload
-    queueMap.current.on('itemRemoved', () => {
-      fetchSDKTaskQueues();
-    });
-
     setInsightsQueues(insightQueues);
   };
 
@@ -264,13 +240,22 @@ const QueueDirectoryTab = (props: OwnProps) => {
     });
   };
 
-  // initial render
-  useEffect(() => {
-    // fetch the queues from the taskrouter sdk on initial render
+  const onReloadClick = () => {
+    setIsLoading(true);
+    fetchQueues();
+  };
+
+  const fetchQueues = () => {
+    // fetch the queues from the taskrouter sdk
     fetchSDKTaskQueues().catch(logger.error);
 
-    // fetch the queues from the insights client on initial render
+    // fetch the queues from the insights client
     fetchInsightsQueueData().catch(logger.error);
+  };
+
+  // initial render
+  useEffect(() => {
+    fetchQueues();
 
     return () => {
       if (queueMap.current) {
@@ -295,6 +280,7 @@ const QueueDirectoryTab = (props: OwnProps) => {
       entries={filteredQueues}
       isLoading={isLoading}
       onTransferClick={onTransferQueueClick}
+      onReloadClick={onReloadClick}
       noEntriesMessage={templates[StringTemplates.NoQueuesAvailable]}
     />
   );
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/SearchBox.tsx b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/SearchBox.tsx
index 6d6097a48..813986786 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/SearchBox.tsx
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/SearchBox.tsx
@@ -1,5 +1,4 @@
 import { Manager, templates } from '@twilio/flex-ui';
-import { Box } from '@twilio-paste/core/box';
 import { Input } from '@twilio-paste/core/input';
 import { SearchIcon } from '@twilio-paste/icons/esm/SearchIcon';
 import { Ref } from 'react';
@@ -28,11 +27,7 @@ const SearchInput = ({ onInputChange, inputRef }: SearchBoxProps) => {
 };
 
 const SearchBox = ({ onInputChange, inputRef }: SearchBoxProps) => {
-  return (
-    <Box width="100%" paddingLeft="space50" paddingRight="space50" paddingTop="space60" paddingBottom="space50">
-      <SearchInput onInputChange={onInputChange} inputRef={inputRef} />
-    </Box>
-  );
+  return <SearchInput onInputChange={onInputChange} inputRef={inputRef} />;
 };
 
 export default SearchBox;
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/WorkerDirectoryTab.tsx b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/WorkerDirectoryTab.tsx
index 395921884..e4c0ff2c2 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/WorkerDirectoryTab.tsx
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/custom-components/WorkerDirectoryTab.tsx
@@ -11,6 +11,7 @@ import {
   showOnlyAvailableWorkers,
   isCbmColdTransferEnabled,
   isCbmWarmTransferEnabled,
+  getMaxTaskRouterWorkers,
   isNativeDigitalXferEnabled,
 } from '../config';
 import { DirectoryEntry } from '../types/DirectoryEntry';
@@ -28,7 +29,7 @@ export interface OwnProps {
   task: ITask;
 }
 
-const QueueDirectoryTab = (props: OwnProps) => {
+const WorkerDirectoryTab = (props: OwnProps) => {
   const [fetchedWorkers, setFetchedWorkers] = useState([] as Array<Worker>);
   const [filteredWorkers, setFilteredWorkers] = useState([] as Array<DirectoryEntry>);
   const [isLoading, setIsLoading] = useState(true);
@@ -47,7 +48,11 @@ const QueueDirectoryTab = (props: OwnProps) => {
     if (!workspaceClient) {
       return;
     }
-    setFetchedWorkers(Array.from((await workspaceClient.fetchWorkers()).values()) as unknown as Array<Worker>);
+    setFetchedWorkers(
+      Array.from(
+        (await workspaceClient.fetchWorkers({ MaxWorkers: getMaxTaskRouterWorkers() })).values(),
+      ) as unknown as Array<Worker>,
+    );
   };
 
   // function to filter the generatedQueueList and trigger a re-render
@@ -72,7 +77,7 @@ const QueueDirectoryTab = (props: OwnProps) => {
             cold_transfer_enabled: isColdTransferEnabled && worker.available,
             warm_transfer_enabled: isWarmTransferEnabled && worker.available,
             label: worker.attributes?.full_name ?? worker.name,
-            labelComponent: (
+            labelComponent: () => (
               <Stack orientation="vertical" spacing="space0">
                 <Text as="div" element="TRANSFER_DIR_COMMON_ROW_NAME">
                   {worker.attributes?.full_name ?? worker.name}
@@ -85,7 +90,7 @@ const QueueDirectoryTab = (props: OwnProps) => {
                 </Stack>
               </Stack>
             ),
-            icon: (
+            icon: () => (
               <Avatar
                 size="sizeIcon60"
                 color="decorative10"
@@ -156,4 +161,4 @@ const QueueDirectoryTab = (props: OwnProps) => {
   );
 };
 
-export default withTaskContext(QueueDirectoryTab);
+export default withTaskContext(WorkerDirectoryTab);
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/flex-hooks/paste-elements/index.ts b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/flex-hooks/paste-elements/index.ts
index 97a4fe6b4..bd4445ccd 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/flex-hooks/paste-elements/index.ts
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/flex-hooks/paste-elements/index.ts
@@ -60,15 +60,4 @@ export const pasteElementHook = {
       'box-shadow': 'none',
     },
   },
-  TRANSFER_DIR_COMMON_ROW_BUTTONGROUP: {
-    display: 'none',
-  },
-  TRANSFER_DIR_COMMON_HORIZONTAL_ROW_CONTAINER: {
-    paddingLeft: 'space30',
-    paddingRight: 'space30',
-    minHeight: '40px',
-    '&:hover span[data-paste-element="TRANSFER_DIR_COMMON_ROW_BUTTONGROUP"]': {
-      display: 'inline-flex',
-    },
-  },
 } as { [key: string]: any };
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/flex-hooks/strings/CustomTransferDirectory.ts b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/flex-hooks/strings/CustomTransferDirectory.ts
index 01e37bf25..69c43950a 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/flex-hooks/strings/CustomTransferDirectory.ts
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/flex-hooks/strings/CustomTransferDirectory.ts
@@ -15,6 +15,7 @@ export enum StringTemplates {
   External = 'PSDirectoryExternal',
   SearchDirectory = 'PSDirectorySearchDirectory',
   NoItemsFound = 'PSDirectoryNoItemsFound',
+  MoreItems = 'PSDirectoryMoreItems',
   NoAgentsAvailable = 'PSDirectoryNoAgentsAvailable',
   NoQueuesAvailable = 'PSDirectoryNoQueuesAvailable',
   ColdTransfer = 'PSDirectoryColdTransfer',
@@ -24,6 +25,7 @@ export enum StringTemplates {
   NA = 'PSDirectoryNA',
   CountryDisabled = 'PSDirectoryCountryDisabled',
   HighRiskSpecialNumberDisabled = 'PSDirectoryHighRiskSpecialNumberDisabled',
+  UpdateList = 'PSDirectoryUpdateList',
 }
 
 export const stringHook = () => ({
@@ -41,6 +43,7 @@ export const stringHook = () => ({
     [StringTemplates.External]: 'External',
     [StringTemplates.SearchDirectory]: 'Search Directory',
     [StringTemplates.NoItemsFound]: 'No items found.',
+    [StringTemplates.MoreItems]: 'More items are available using the search field above.',
     [StringTemplates.NoAgentsAvailable]: 'No agents are currently eligible to receive a transfer.',
     [StringTemplates.NoQueuesAvailable]: 'No queues are currently eligible to receive a transfer.',
     [StringTemplates.ColdTransfer]: 'Cold Transfer',
@@ -51,6 +54,7 @@ export const stringHook = () => ({
     [StringTemplates.CountryDisabled]: 'Dialing to this country has been disabled.',
     [StringTemplates.HighRiskSpecialNumberDisabled]:
       'This number is considered high-risk and dialing it has been disabled.',
+    [StringTemplates.UpdateList]: 'Update list',
   },
   'es-MX': esMX,
   'pt-BR': ptBR,
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/types/DirectoryEntry.ts b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/types/DirectoryEntry.ts
index 5512b3b8f..489099361 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/types/DirectoryEntry.ts
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/types/DirectoryEntry.ts
@@ -2,9 +2,9 @@ export interface DirectoryEntry {
   key: string;
   cold_transfer_enabled: boolean;
   warm_transfer_enabled: boolean;
-  icon?: React.JSX.Element;
+  icon?: () => React.JSX.Element;
   label: string;
-  labelComponent?: React.JSX.Element;
+  labelComponent?: () => React.JSX.Element;
   address: string;
   tooltip?: string;
   type: 'number' | 'queue' | 'worker';
diff --git a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/types/ServiceConfiguration.ts b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/types/ServiceConfiguration.ts
index 284be9eb4..39a94641d 100644
--- a/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/types/ServiceConfiguration.ts
+++ b/plugin-flex-ts-template-v2/src/feature-library/custom-transfer-directory/types/ServiceConfiguration.ts
@@ -2,9 +2,11 @@ import { ExternalDirectoryEntry } from './DirectoryEntry';
 
 export default interface CustomTransferDirectoryConfig {
   enabled: boolean;
+  max_items: number;
   worker: {
     enabled: boolean;
     show_only_available_workers: boolean;
+    max_taskrouter_workers: number;
   };
   queue: {
     enabled: boolean;