diff --git a/bun.lockb b/bun.lockb
index 6688b4a..4dabad1 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index 4044deb..0ab0328 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bb-component-SuperTable",
-  "version": "2.0.17-alpha",
+  "version": "2.0.18-alpha",
   "description": "A Fully Customizable Budibase Table Component",
   "author": "Michael Poirazi",
   "license": "MIT",
@@ -37,4 +37,4 @@
     "rollup-plugin-svg": "^2.0.0",
     "tar": "^6.1.11"
   }
-}
\ No newline at end of file
+}
diff --git a/schema.json b/schema.json
index 6a3e493..612d269 100644
--- a/schema.json
+++ b/schema.json
@@ -205,7 +205,7 @@
               { "label": "Single", "value": "single", "barIcon": "Checkmark" },
               { "label": "Multiple", "value": "multi", "barIcon": "MultipleCheck" }
             ],
-            "defaultValue": "single"
+            "defaultValue": "off"
           },
           {
             "type": "text",
diff --git a/src/Component.svelte b/src/Component.svelte
index a88accd..1814ae2 100644
--- a/src/Component.svelte
+++ b/src/Component.svelte
@@ -4,10 +4,137 @@
 
   const { styleable } = getContext("sdk");
   const component = getContext("component");
+
+  export let datasource;
+  export let idColumn;
+  export let sortColumn;
+  export let sortOrder;
+  export let limit;
+  export let fetchOnScroll;
+  export let fetchPageSize;
+  export let autoRefresh;
+  export let autoRefreshRate;
+  export let paginate;
+  export let filter;
+  export let columnList = [];
+  export let autocolumns;
+
+  export let visibleRowCount;
+  export let showFooter;
+  export let showHeader;
+  export let size;
+  export let canInsert, canDelete, canEdit, canSort, canResize, canFilter;
+  export let showFilterOperators;
+  export let superColumnsPos;
+
+  export let debounce = 750;
+
+  export let rowSelectMode;
+  export let preselectedId;
+  export let preselectedIds;
+  export let selectionColumn;
+  export let selectionLimit;
+
+  export let columnSizing = "flex";
+  export let columnMinWidth = "6rem";
+  export let columnMaxWidth = "auto";
+  export let columnFixedWidth;
+
+  export let headerFontSize, headerColor, headerBgColor, headerAlign;
+  export let dividers, dividersColor;
+
+  export let rowVerticalAlign,
+    rowHorizontalAlign,
+    rowFontSize,
+    rowColorTemplate,
+    rowBGColorTemplate;
+
+  export let footerAlign,
+    footerFontSize,
+    footerColorTemplate,
+    footerBGColorTemplate;
+
+  export let customCellPadding;
+  export let customBaseFont;
+  export let customRowHeight;
+  export let useOptionColors = true;
+  export let optionsViewMode = "pills";
+  export let relViewMode = "pills";
+  export let zebraColors = false;
+  export let highlighters;
+
+  // Events
+  export let onRowSelect;
+  export let onCellChange;
+  export let onRowClick;
+  export let onRowDblClick;
 </script>
 
 <div use:styleable={$component.styles}>
-  <SuperTable {...$$props}>
+  <SuperTable
+    {datasource}
+    {idColumn}
+    {sortColumn}
+    {sortOrder}
+    {limit}
+    {fetchOnScroll}
+    {fetchPageSize}
+    {autoRefresh}
+    {autoRefreshRate}
+    {paginate}
+    {filter}
+    {columnList}
+    {autocolumns}
+    {visibleRowCount}
+    {showFooter}
+    {showHeader}
+    {size}
+    {canInsert}
+    {canDelete}
+    {canEdit}
+    {canSort}
+    {canResize}
+    {canFilter}
+    {showFilterOperators}
+    {superColumnsPos}
+    {debounce}
+    {rowSelectMode}
+    {preselectedId}
+    {preselectedIds}
+    {selectionColumn}
+    {selectionLimit}
+    {columnSizing}
+    {columnMinWidth}
+    {columnMaxWidth}
+    {columnFixedWidth}
+    {headerFontSize}
+    {headerColor}
+    {headerBgColor}
+    {headerAlign}
+    {dividers}
+    {dividersColor}
+    {rowVerticalAlign}
+    {rowHorizontalAlign}
+    {rowFontSize}
+    {rowColorTemplate}
+    {rowBGColorTemplate}
+    {footerAlign}
+    {footerFontSize}
+    {footerColorTemplate}
+    {footerBGColorTemplate}
+    {customCellPadding}
+    {customBaseFont}
+    {customRowHeight}
+    {useOptionColors}
+    {optionsViewMode}
+    {relViewMode}
+    {zebraColors}
+    {highlighters}
+    {onRowSelect}
+    {onCellChange}
+    {onRowClick}
+    {onRowDblClick}
+  >
     <slot />
   </SuperTable>
-</div>
\ No newline at end of file
+</div>