diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx
index 2e1fc8e..ddf735d 100755
--- a/src/components/Table/index.tsx
+++ b/src/components/Table/index.tsx
@@ -1,6 +1,7 @@
 export { makeDateSorter, makeNumericSorter, makeStringSorter } from './sorters'
 export { EditableTable, makeActionHandler } from './EditableTable'
 export { DatePickerWrapper } from './DatePickerWrapper'
+export { DateRangeWrapper } from './DateRangeWrapper'
 export { Table } from './Table'
 export {
     RegExpIsFloat,
@@ -33,6 +34,8 @@ export type {
     TagInputProps,
     columnPropsOther,
 } from './Columns'
+export type { DateRangeWrapperProps } from './DateRangeWrapper'
+export type { DatePickerWrapperProps } from './DatePickerWrapper'
 export type { BaseTableColumn, TableColumns, TableContainer } from './Table'
 
 export const defaultPagination = {
diff --git a/src/pages/Reports/DiagramReport/index.jsx b/src/pages/Reports/DiagramReport/index.jsx
index e5b40e4..6462abd 100644
--- a/src/pages/Reports/DiagramReport/index.jsx
+++ b/src/pages/Reports/DiagramReport/index.jsx
@@ -4,9 +4,9 @@ import { useState, useEffect, memo, useCallback, useContext } from 'react'
 import { Radio, Button, Select, notification } from 'antd'
 
 import { IdWellContext } from '@asb/context'
+import { DateRangeWrapper } from 'components/Table'
 import { LoaderPortal } from '@components/LoaderPortal'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import { DateRangeWrapper } from 'components/Table/DateRangeWrapper'
 import { Subscribe } from '@services/signalr'
 import { ReportService } from '@api'
 
diff --git a/src/pages/Telemetry/Operations/index.jsx b/src/pages/Telemetry/Operations/index.jsx
index 1af6816..f6f57fc 100644
--- a/src/pages/Telemetry/Operations/index.jsx
+++ b/src/pages/Telemetry/Operations/index.jsx
@@ -4,8 +4,8 @@ import moment from 'moment'
 
 import { IdWellContext } from '@asb/context'
 import LoaderPortal from '@components/LoaderPortal'
+import { DateRangeWrapper } from '@components/Table'
 import { invokeWebApiWrapperAsync } from '@components/factory'
-import DateRangeWrapper from '@components/Table/DateRangeWrapper'
 import { DetectedOperationService, TelemetryDataSaubService } from '@api'
 import { range } from '@utils'