diff --git a/src/Language/Wasm/Parser.y b/src/Language/Wasm/Parser.y
index c9630b3..bb804eb 100644
--- a/src/Language/Wasm/Parser.y
+++ b/src/Language/Wasm/Parser.y
@@ -617,8 +617,7 @@ memory :: { Memory }
 
 -- TABLE --
 limits :: { Limit }
-    : u32 u32 { Limit (fromIntegral $1) (Just $ fromIntegral $2) }
-    | u32 { Limit (fromIntegral $1) Nothing }
+    : u32 opt(u32) { Limit (fromIntegral $1) (fromIntegral `fmap` $2) }
 
 elemtype :: { ElemType }
     : 'anyfunc' { AnyFunc }
@@ -632,17 +631,22 @@ table :: { [ModuleField] }
 limits_elemtype_elem :: { [ModuleField] }
     : tabletype ')' { [MFTable $ Table Nothing $1] }
     | elemtype '(' 'elem' list(funcidx) ')' ')' {
-            let funcsLen = fromIntegral $ length $4 in [
-                MFTable $ Table Nothing $ TableType (Limit funcsLen (Just funcsLen)) $1,
-                MFElem $ ElemSegment (Index 0) [PlainInstr $ I32Const 0] $4
-            ]
-        }
+        let funcsLen = fromIntegral $ length $4 in [
+            MFTable $ Table Nothing $ TableType (Limit funcsLen (Just funcsLen)) $1,
+            MFElem $ ElemSegment (Index 0) [PlainInstr $ I32Const 0] $4
+        ]
+    }
+    | '(' import_export_table { $2 }
+
+import_export_table :: { [ModuleField] }
+    : 'import' name name ')' tabletype ')' { [MFImport $ Import $2 $3 $ ImportTable Nothing $5] }
+    | 'export' name ')' limits_elemtype_elem { (MFExport $ Export $2 $ ExportTable Nothing) : $4 }
 
 -- TABLE END --
 
 exportdesc :: { ExportDesc }
     : 'func' funcidx ')' { ExportFunc (Just $2) }
-    | 'table' tableidx ')' { ExportTable $2 }
+    | 'table' tableidx ')' { ExportTable (Just $2) }
     | 'memory' memidx ')' { ExportMemory $2 }
     | 'global' globalidx ')' { ExportGlobal $2 }
 
@@ -728,7 +732,9 @@ t3thd (_, _, a) = a
 appendIdent :: Maybe Ident -> ModuleField -> ModuleField
 appendIdent i (MFFunc fun) = MFFunc $ fun { ident = i }
 appendIdent i (MFImport (Import sm name (ImportFunc _ typeUse))) = MFImport $ Import sm name $ ImportFunc i typeUse
+appendIdent i (MFImport (Import sm name (ImportTable _ elemType))) = MFImport $ Import sm name $ ImportTable i elemType
 appendIdent i (MFExport (Export name (ExportFunc _))) = MFExport $ Export name $ ExportFunc $ Named <$> i
+appendIdent i (MFExport (Export name (ExportTable _))) = MFExport $ Export name $ ExportTable $ Named <$> i
 appendIdent i (MFTable (Table _ tableType)) = MFTable $ Table i tableType
 appendIdent (Just id) (MFElem segm) = MFElem $ segm { tableIndex = Named id }
 appendIdent _ mf = mf
@@ -1068,7 +1074,7 @@ data Table = Table (Maybe Ident) TableType deriving (Show, Eq)
 
 data ExportDesc =
     ExportFunc (Maybe FuncIndex)
-    | ExportTable TableIndex
+    | ExportTable (Maybe TableIndex)
     | ExportMemory MemoryIndex
     | ExportGlobal GlobalIndex
     deriving (Show, Eq)
diff --git a/tests/samples/mod2.wast b/tests/samples/mod2.wast
index d9fff60..ebc0392 100644
--- a/tests/samples/mod2.wast
+++ b/tests/samples/mod2.wast
@@ -29,6 +29,11 @@
   (type $forward (func (param i32)))
 
   (table anyfunc (elem $print_i32 $print_f64))
+  (table (export "my-table") anyfunc (elem $print_i32 $print_f64))
+  (table (export "my-table") (export "my-table2") anyfunc (elem $print_i32 $print_f64))
+  (table (import "external-mod" "external-table") 0 anyfunc)
+  (table (export "my-table") (import "external-mod" "external-table") 0 anyfunc)
+  (table (export "my-table") (export "my-table2") (import "external-mod" "external-table") 0 anyfunc)
 
   (func (export "print32") (param $i i32)
     (local $x f32)