diff --git a/ui/src/main/webapp/components/table/CustomTable.jsx b/ui/src/main/webapp/components/table/CustomTable.jsx
index c057efc53..e045d5d43 100755
--- a/ui/src/main/webapp/components/table/CustomTable.jsx
+++ b/ui/src/main/webapp/components/table/CustomTable.jsx
@@ -25,6 +25,7 @@ function CustomTable({
     handleSort,
     sortDir,
     sortKey,
+    tableConfig
 }) {
     const unifiedConfigs = getUnifiedConfigs();
     const [entityModal, setEntityModal] = useState({ open: false });
@@ -32,11 +33,6 @@ function CustomTable({
 
     const { rowData } = useContext(TableContext);
 
-    const tableConfig =
-        page === PAGE_INPUT
-            ? unifiedConfigs.pages.inputs.table
-            : unifiedConfigs.pages.configuration.tabs.filter((x) => x.name === serviceName)[0]
-                  .table;
     const { moreInfo, header } = tableConfig;
     const headers = tableConfig.header;
 
@@ -237,12 +233,12 @@ function CustomTable({
                                 handleToggleActionClick={handleToggleActionClick}
                                 {...(moreInfo
                                     ? {
-                                          expansionRow: getExpansionRow(
-                                              columns.length,
-                                              row,
-                                              moreInfo
-                                          ),
-                                      }
+                                        expansionRow: getExpansionRow(
+                                            columns.length,
+                                            row,
+                                            moreInfo
+                                        ),
+                                    }
                                     : {})}
                             />
                         );
diff --git a/ui/src/main/webapp/components/table/TableExpansionRow.jsx b/ui/src/main/webapp/components/table/TableExpansionRow.jsx
index 77373e3c3..185e376fd 100644
--- a/ui/src/main/webapp/components/table/TableExpansionRow.jsx
+++ b/ui/src/main/webapp/components/table/TableExpansionRow.jsx
@@ -34,7 +34,12 @@ function getExpansionRowData(row, moreInfo) {
 }
 
 export function getExpansionRow(colSpan, row, moreInfo) {
-    const { customRow } = getUnifiedConfigs().pages.inputs.table;
+
+    const inputs = getUnifiedConfigs().pages?.inputs;
+
+    const customRow = inputs?.table
+        ? (inputs.table.customRow)
+        : (inputs.services.find((service) => service.name === row.serviceName).table?.customRow);
 
     return (
         <Table.Row key={`${row.id}-expansion`}>
diff --git a/ui/src/main/webapp/components/table/TableFilter.jsx b/ui/src/main/webapp/components/table/TableFilter.jsx
index 4b75d0e93..0f4809cf0 100644
--- a/ui/src/main/webapp/components/table/TableFilter.jsx
+++ b/ui/src/main/webapp/components/table/TableFilter.jsx
@@ -1,8 +1,13 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import Text from '@splunk/react-ui/Text';
 import PropTypes from 'prop-types';
+import TableContext from '../../context/TableContext';
 
 function TableFilter(props) {
+
+    const { searchText } = useContext(TableContext);
+
+    // We need to remove this function later
     const debounce = (func, wait) => {
         let timeout;
 
@@ -34,7 +39,8 @@ function TableFilter(props) {
         <Text
             appearance="search"
             placeholder="filter"
-            onChange={debounce(props.handleChange, 200)}
+            onChange={props.handleChange}
+            value={searchText}
         />
     );
 }
diff --git a/ui/src/main/webapp/components/table/TableHeader.jsx b/ui/src/main/webapp/components/table/TableHeader.jsx
index 41c3842a0..35b36f6d4 100755
--- a/ui/src/main/webapp/components/table/TableHeader.jsx
+++ b/ui/src/main/webapp/components/table/TableHeader.jsx
@@ -24,7 +24,7 @@ const TableFilterWrapper = styled.div`
     width: 100%;
 `;
 
-function TableHeader({ page, services, totalElement, handleRequestModalOpen }) {
+function TableHeader({ page, isOuterTable, services, totalElement, handleRequestModalOpen }) {
     const {
         pageSize,
         currentPage,
@@ -82,7 +82,7 @@ function TableHeader({ page, services, totalElement, handleRequestModalOpen }) {
                             <Select.Option key="25" label={_('25 Per Page')} value={25} />
                             <Select.Option key="50" label={_('50 Per Page')} value={50} />
                         </Select>
-                        {getSearchTypeDropdown()}
+                        {isOuterTable ? getSearchTypeDropdown() : null}
                     </TableSelectBoxWrapper>
                 ) : null}
             </div>
@@ -101,7 +101,7 @@ function TableHeader({ page, services, totalElement, handleRequestModalOpen }) {
                     alwaysShowLastPageLink
                     totalPages={Math.ceil(totalElement / pageSize)}
                 />
-                {page === PAGE_INPUT ? null : (
+                {page === PAGE_INPUT && isOuterTable ? null : (
                     <Button
                         label={_('Add')}
                         appearance="primary"
diff --git a/ui/src/main/webapp/components/table/TableWrapper.jsx b/ui/src/main/webapp/components/table/TableWrapper.jsx
index 51c230a29..132458a43 100755
--- a/ui/src/main/webapp/components/table/TableWrapper.jsx
+++ b/ui/src/main/webapp/components/table/TableWrapper.jsx
@@ -23,18 +23,24 @@ function TableWrapper({ page, serviceName, handleRequestModalOpen, handleOpenPag
     );
 
     const unifiedConfigs = getUnifiedConfigs();
-    const tableConfig =
-        page === PAGE_INPUT
-            ? unifiedConfigs.pages.inputs.table
-            : unifiedConfigs.pages.configuration.tabs.filter((x) => x.name === serviceName)[0]
-                  .table;
-    const headers = tableConfig.header;
-    const { moreInfo } = tableConfig;
+
+    const outerTable = unifiedConfigs.pages.inputs?.table;
+
     const services =
         page === PAGE_INPUT
             ? unifiedConfigs.pages.inputs.services
             : unifiedConfigs.pages.configuration.tabs.filter((x) => x.name === serviceName);
 
+    const tableConfig =
+        page === PAGE_INPUT
+            ? (outerTable ? outerTable : services.find((x) => x.name === serviceName).table)
+            : unifiedConfigs.pages.configuration.tabs.find((x) => x.name === serviceName)
+                .table;
+
+    const { moreInfo } = tableConfig;
+    const headers = tableConfig.header;
+    const isOuterTable = outerTable ? true : false;
+
     const modifyAPIResponse = (data) => {
         const obj = {};
         services.forEach((service, index) => {
@@ -209,6 +215,11 @@ function TableWrapper({ page, serviceName, handleRequestModalOpen, handleOpenPag
             arr = findByMatchingValue(rowData[searchType]);
         }
 
+        // For Inputs page, filter the data when tab change
+        if (!isOuterTable) {
+            arr = arr.filter((v) => v.serviceName === serviceName);
+        }
+
         const _sortKey = isCustomMapping ? 'serviceTitle' : sortKey;
 
         // Sort the array based on the sort value
@@ -252,6 +263,7 @@ function TableWrapper({ page, serviceName, handleRequestModalOpen, handleOpenPag
                 services={services}
                 totalElement={totalElement}
                 handleRequestModalOpen={handleRequestModalOpen}
+                isOuterTable={isOuterTable}
             />
             <CustomTable
                 page={page}
@@ -262,6 +274,8 @@ function TableWrapper({ page, serviceName, handleRequestModalOpen, handleOpenPag
                 sortDir={sortDir}
                 sortKey={sortKey}
                 handleOpenPageStyleDialog={handleOpenPageStyleDialog}
+                tableConfig={tableConfig}
+                services={services}
             />
         </>
     );
diff --git a/ui/src/main/webapp/pages/Input/InputPage.jsx b/ui/src/main/webapp/pages/Input/InputPage.jsx
index c61f8b5ac..4b44266af 100755
--- a/ui/src/main/webapp/pages/Input/InputPage.jsx
+++ b/ui/src/main/webapp/pages/Input/InputPage.jsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
 
 import ColumnLayout from '@splunk/react-ui/ColumnLayout';
@@ -7,6 +7,7 @@ import Dropdown from '@splunk/react-ui/Dropdown';
 import Menu from '@splunk/react-ui/Menu';
 import styled from 'styled-components';
 import ToastMessages from '@splunk/react-toast-notifications/ToastMessages';
+import TabBar from '@splunk/react-ui/TabBar';
 import { _ } from '@splunk/ui-utils/i18n';
 import { getFormattedMessage } from '../../util/messageUtil';
 import { getUnifiedConfigs } from '../../util/util';
@@ -37,17 +38,73 @@ const Row = styled(ColumnLayout.Row)`
 
 function InputPage() {
     const [entity, setEntity] = useState({ open: false });
-
     const unifiedConfigs = getUnifiedConfigs();
     const { services, title, description, menu: customMenuField } = unifiedConfigs.pages.inputs;
+
+    // Used for outer table is present or not
+    const table = unifiedConfigs.pages.inputs?.table;
+    const isOuterTable = table ? true : false;
+
+    const [activeTabId, setActiveTabId] = useState(services[0].name);
+    const [selectedTabDescription, setSelectedTabDescription] = useState(services[0]?.description || "");
+    const [selectedTabTitle, setSelectedTabTitle] = useState(services[0].title);
+
     const toggle = (
         <Button appearance="primary" id="addInputBtn" label={_('Create New Input')} isMenu />
     );
     const PERMITTED_MODES = [MODE_CLONE, MODE_CREATE, MODE_EDIT];
+    const permittedTabNames = services.map((service) => {
+        return service.name;
+    });
 
     const history = useHistory();
     const query = useQuery();
 
+    useEffect(() => {
+        setServiceEntity();
+        setActiveTab();
+    }, [history.location.search]);
+
+    const setServiceEntity = () => {
+        const service = services.find((x) => x.name === query.get('service'));
+        // Run only when service and action/mode is valid and modal/page is not open
+        if (query && service && PERMITTED_MODES.includes(query.get('action')) && !entity.open) {
+            // run when mode is not create and previous state info is available
+            if (query.get('action') !== MODE_CREATE && entity.stanzaName) {
+                setEntity({
+                    ...entity,
+                    open: true,
+                    isInputPageStyle: true,
+                    serviceName: query.get('service'),
+                    mode: query.get('action'),
+                });
+            } else {
+                // If previous state information is unavailable, create mode will be used by default
+                setEntity({
+                    ...entity,
+                    open: true,
+                    isInputPageStyle: true,
+                    serviceName: query.get('service'),
+                    formLabel: `Create ${service?.title}`,
+                    mode: MODE_CREATE,
+                });
+            }
+        } else if (
+            (!query.get('service') || !query.get('action')) &&
+            entity.open &&
+            entity.isInputPageStyle
+        ) {
+            // Close page when any of the required query params are not provided
+            setEntity({ ...entity, open: false });
+        }
+    }
+
+    const setActiveTab = () => {
+        if (query && permittedTabNames.includes(query.get('service'))) {
+            setActiveTabId(query.get('service'));
+        }
+    }
+
     const getInputMenu = () => {
         let arr = [];
         arr = services.map((service) => {
@@ -135,41 +192,6 @@ function InputPage() {
         );
     };
 
-    useEffect(() => {
-        const service = services.find((x) => x.name === query.get('service'));
-        // Run only when service and action/mode is valid and modal/page is not open
-        if (query && service && PERMITTED_MODES.includes(query.get('action')) && !entity.open) {
-            // run when mode is not create and previous state info is available
-            if (query.get('action') !== MODE_CREATE && entity.stanzaName) {
-                setEntity({
-                    ...entity,
-                    open: true,
-                    isInputPageStyle: true,
-                    serviceName: query.get('service'),
-                    mode: query.get('action'),
-                });
-            } else {
-                // if previous state info is not available then default to create mode
-                setEntity({
-                    ...entity,
-                    open: true,
-                    isInputPageStyle: true,
-                    serviceName: query.get('service'),
-                    formLabel: `Create ${service?.title}`,
-                    mode: MODE_CREATE,
-                });
-            }
-        } else if (
-            (!query.get('service') || !query.get('action')) &&
-            entity.open &&
-            entity.isInputPageStyle
-        ) {
-            // Close page when any of the required query params are not provided
-            setEntity({ ...entity, open: false });
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [history.location.search]);
-
     const changeRoute = (val) => {
         Object.keys(val).forEach((key) => {
             query.set(key, val[key]);
@@ -177,6 +199,73 @@ function InputPage() {
         history.push({ search: query.toString() });
     };
 
+    const onTabChange = useCallback((e, { selectedTabId }) => {
+        setActiveTabId(selectedTabId);
+
+        const selectedTabInfo = services.find((service) => service.name === selectedTabId);
+        if (selectedTabInfo) {
+            setSelectedTabDescription(selectedTabInfo.description);
+            setSelectedTabTitle(selectedTabInfo.title);
+        }
+
+        query.set('service', selectedTabId);
+        history.push({ search: query.toString() });
+
+    }, [activeTabId]);
+
+    // Making a dropdown if we have more than one service
+    const makeSingleSelectDropDown = () => {
+        return (
+            <ColumnLayout.Column className="dropdown" span={3}>
+                <Dropdown toggle={toggle}>
+                    <Menu
+                        onClick={(event) => {
+                            const findname =
+                                services[
+                                    services.findIndex(
+                                        (x) =>
+                                            x.title === event.target.innerText
+                                    )
+                                ].name;
+                            handleRequestOpen(findname, event.target.innerText);
+                        }}
+                    >
+                        {getInputMenu()}
+                    </Menu>
+                </Dropdown>
+            </ColumnLayout.Column>
+        )
+    }
+
+    // Making a dropdown if we have one service
+    const makeInputButton = () => {
+        return (
+            <ColumnLayout.Column span={3} className="input_button">
+                <Button
+                    label={getFormattedMessage(100)}
+                    appearance="primary"
+                    id="addInputBtn"
+                    onClick={() => {
+                        handleRequestOpen(services[0].name, services[0].title);
+                    }}
+                />
+            </ColumnLayout.Column>
+        )
+    }
+
+    // Making a custom menu
+    const makeCustomMenu = () => {
+        return (
+            <ColumnLayout.Column span={3} className="input_button">
+                {React.createElement(CustomMenu, {
+                    fileName: customMenuField.src,
+                    type: customMenuField.type,
+                    handleChange: changeRoute,
+                })}
+            </ColumnLayout.Column>
+        )
+    }
+
     return (
         <ErrorBoundary>
             <TableContextProvider value={null}>
@@ -191,57 +280,55 @@ function InputPage() {
                     <ColumnLayout gutter={8}>
                         <Row>
                             <ColumnLayout.Column span={9}>
-                                <TitleComponent>{_(title)}</TitleComponent>
-                                <SubTitleComponent>{_(description || '')}</SubTitleComponent>
+                                <TitleComponent>{ isOuterTable ? _(title || "") : _(selectedTabTitle) }</TitleComponent>
+                                <SubTitleComponent>{ isOuterTable ? _(description || "") :  _(selectedTabDescription || '') }</SubTitleComponent>
                             </ColumnLayout.Column>
-                            {services && services.length > 1 && !customMenuField?.src && (
-                                <ColumnLayout.Column className="dropdown" span={3}>
-                                    <Dropdown toggle={toggle}>
-                                        <Menu
-                                            onClick={(event) => {
-                                                const findname =
-                                                    services[
-                                                        services.findIndex(
-                                                            (x) =>
-                                                                x.title === event.target.innerText
-                                                        )
-                                                    ].name;
-                                                handleRequestOpen(findname, event.target.innerText);
-                                            }}
-                                        >
-                                            {getInputMenu()}
-                                        </Menu>
-                                    </Dropdown>
-                                </ColumnLayout.Column>
-                            )}
-                            {services && services.length === 1 && !customMenuField?.src && (
-                                <ColumnLayout.Column span={3} className="input_button">
-                                    <Button
-                                        label={getFormattedMessage(100)}
-                                        appearance="primary"
-                                        id="addInputBtn"
-                                        onClick={() => {
-                                            handleRequestOpen(services[0].name, services[0].title);
-                                        }}
-                                    />
-                                </ColumnLayout.Column>
-                            )}
-                            {customMenuField?.src && (
-                                <ColumnLayout.Column span={3} className="input_button">
-                                    {React.createElement(CustomMenu, {
-                                        fileName: customMenuField.src,
-                                        type: customMenuField.type,
-                                        handleChange: changeRoute,
-                                    })}
-                                </ColumnLayout.Column>
-                            )}
+                            {
+                                isOuterTable ? (
+                                    (services && !customMenuField?.src) ?
+                                    ((services.length > 1) ? makeSingleSelectDropDown() : makeInputButton()) :
+                                    makeCustomMenu()
+                                ) : null
+                            }
                         </Row>
                     </ColumnLayout>
+                    {
+                        isOuterTable ? (
+                            <TableWrapper
+                                page={PAGE_INPUT}
+                                handleOpenPageStyleDialog={handleOpenPageStyleDialog}
+                            />
+                        ) : (
+                            <>
+                                <TabBar activeTabId={activeTabId} onChange={onTabChange}>
+                                    {services.map((service) => {
+                                        return (<TabBar.Tab key={service.name} label={_(service.title)} tabId={service.name}> </TabBar.Tab>)
+                                    })}
+                                </TabBar>
+                                {
+                                    services.map((service) => {
+                                        return (
+                                            <div
+                                                key={service.name}
+                                                style={
+                                                    service.name !== activeTabId ? { display: 'none' } : { display: 'block' }
+                                                }
+                                                id={`${service.name}Tab`}
+                                            >
+                                                <TableWrapper
+                                                    page={PAGE_INPUT}
+                                                    serviceName={service.name}
+                                                    handleRequestModalOpen={() => handleRequestOpen(service.name, service.title)}
+                                                    handleOpenPageStyleDialog={handleOpenPageStyleDialog}
+                                                />
+                                            </div>
+                                        )
+                                    })
+                                }
+                            </>
+                        )
+                    }
 
-                    <TableWrapper
-                        page={PAGE_INPUT}
-                        handleOpenPageStyleDialog={handleOpenPageStyleDialog}
-                    />
                     <ToastMessages position="top-right" />
                     {!entity.isInputPageStyle && entity.open ? generateModalDialog() : null}
                 </div>
diff --git a/ui/src/main/webapp/schema/schema.json b/ui/src/main/webapp/schema/schema.json
index 406c46ebd..61d8c76be 100644
--- a/ui/src/main/webapp/schema/schema.json
+++ b/ui/src/main/webapp/schema/schema.json
@@ -758,119 +758,240 @@
       "additionalProperties": false
     },
     "InputsPage": {
-      "type": "object",
-      "properties": {
-        "title": {
-          "type": "string",
-          "maxLength": 60
-        },
-        "description": {
-          "type": "string",
-          "maxLength": 200
-        },
-        "table": {
-          "$ref": "#/definitions/InputsTable"
-        },
-        "services": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "properties": {
-              "name": {
-                "type": "string",
-                "pattern": "^[0-9a-zA-Z][0-9a-zA-Z_-]*$",
-                "maxLength": 50
-              },
-              "title": {
-                "type": "string",
-                "maxLength": 100
-              },
-              "entity": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/definitions/InputsEntity"
-                }
-              },
-              "options": {
-                "$ref": "#/definitions/Hooks"
-              },
-              "groups": {
-                "type": "array",
-                "items": {
-                  "type": "object",
-                  "properties": {
-                    "options": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "title": {
+              "type": "string",
+              "maxLength": 60
+            },
+            "description": {
+              "type": "string",
+              "maxLength": 200
+            },
+            "menu": {
+              "type": "object"
+            },
+            "table": {
+              "$ref": "#/definitions/InputsTable"
+            },
+            "services": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "pattern": "^[0-9a-zA-Z][0-9a-zA-Z_-]*$",
+                    "maxLength": 50
+                  },
+                  "title": {
+                    "type": "string",
+                    "maxLength": 100
+                  },
+                  "entity": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/definitions/InputsEntity"
+                    }
+                  },
+                  "options": {
+                    "$ref": "#/definitions/Hooks"
+                  },
+                  "groups": {
+                    "type": "array",
+                    "items": {
                       "type": "object",
                       "properties": {
-                        "isExpandable": {
-                          "type": "boolean"
+                        "options": {
+                          "type": "object",
+                          "properties": {
+                            "isExpandable": {
+                              "type": "boolean"
+                            },
+                            "expand": {
+                              "type": "boolean"
+                            }
+                          }
                         },
-                        "expand": {
-                          "type": "boolean"
+                        "label": {
+                          "type": "string",
+                          "maxLength": 100
+                        },
+                        "field": {
+                          "type": "array",
+                          "items": {
+                            "type": "string",
+                            "pattern": "^\\w+$"
+                          }
                         }
-                      }
-                    },
-                    "label": {
-                      "type": "string",
-                      "maxLength": 100
-                    },
-                    "field": {
-                      "type": "array",
-                      "items": {
-                        "type": "string",
-                        "pattern": "^\\w+$"
-                      }
+                      },
+                      "required": [
+                        "label"
+                      ]
                     }
                   },
+                  "style": {
+                    "type": "string",
+                    "enum": [
+                      "page",
+                      "dialog"
+                    ]
+                  },
+                  "hook": {
+                    "type": "object"
+                  },
+                  "conf": {
+                    "type": "string",
+                    "maxLength": 100
+                  },
+                  "restHandlerName": {
+                    "type": "string",
+                    "maxLength": 100
+                  },
+                  "restHandlerModule": {
+                    "type": "string",
+                    "maxLength": 100
+                  },
+                  "restHandlerClass": {
+                    "type": "string",
+                    "maxLength": 100
+                  }
+                },
+                "not": {
                   "required": [
-                    "label"
+                    "table"
                   ]
-                }
-              },
-              "style": {
-                "type": "string",
-                "enum": [
-                  "page",
-                  "dialog"
+                },
+                "required": [
+                  "name",
+                  "title",
+                  "entity"
                 ]
-              },
-              "hook": {
-                "type": "object"
-              },
-              "conf": {
-                "type": "string",
-                "maxLength": 100
-              },
-              "restHandlerName": {
-                "type": "string",
-                "maxLength": 100
-              },
-              "restHandlerModule": {
-                "type": "string",
-                "maxLength": 100
-              },
-              "restHandlerClass": {
-                "type": "string",
-                "maxLength": 100
               }
-            },
-            "required": [
-              "name",
-              "title",
-              "entity"
-            ]
-          }
+            }
+          },
+          "required": [
+            "title",
+            "table",
+            "services"
+          ],
+          "additionalProperties": false
         },
-        "menu": {
-          "type": "object"
+        {
+          "type": "object",
+          "properties": {
+            "title": {
+              "type": "string",
+              "maxLength": 60
+            },
+            "services": {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "pattern": "^[0-9a-zA-Z][0-9a-zA-Z_-]*$",
+                    "maxLength": 50
+                  },
+                  "title": {
+                    "type": "string",
+                    "maxLength": 100
+                  },
+                  "description": {
+                    "type": "string",
+                    "maxLength": 200
+                  },
+                  "table": {
+                    "$ref": "#/definitions/InputsTable"
+                  },
+                  "entity": {
+                    "type": "array",
+                    "items": {
+                      "$ref": "#/definitions/InputsEntity"
+                    }
+                  },
+                  "options": {
+                    "$ref": "#/definitions/Hooks"
+                  },
+                  "groups": {
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "options": {
+                          "type": "object",
+                          "properties": {
+                            "isExpandable": {
+                              "type": "boolean"
+                            },
+                            "expand": {
+                              "type": "boolean"
+                            }
+                          }
+                        },
+                        "label": {
+                          "type": "string",
+                          "maxLength": 100
+                        },
+                        "field": {
+                          "type": "array",
+                          "items": {
+                            "type": "string",
+                            "pattern": "^\\w+$"
+                          }
+                        }
+                      },
+                      "required": [
+                        "label"
+                      ]
+                    }
+                  },
+                  "style": {
+                    "type": "string",
+                    "enum": [
+                      "page",
+                      "dialog"
+                    ]
+                  },
+                  "hook": {
+                    "type": "object"
+                  },
+                  "conf": {
+                    "type": "string",
+                    "maxLength": 100
+                  },
+                  "restHandlerName": {
+                    "type": "string",
+                    "maxLength": 100
+                  },
+                  "restHandlerModule": {
+                    "type": "string",
+                    "maxLength": 100
+                  },
+                  "restHandlerClass": {
+                    "type": "string",
+                    "maxLength": 100
+                  }
+                },
+                "required": [
+                  "name",
+                  "title",
+                  "table",
+                  "entity"
+                ]
+              }
+            }
+          },
+          "required": [
+            "title",
+            "services"
+          ],
+          "additionalProperties": false
         }
-      },
-      "required": [
-        "title",
-        "table",
-        "services"
-      ],
-      "additionalProperties": false
+      ]
     },
     "InputsTable": {
       "type": "object",