diff --git a/src/stub-gen/generator.ts b/src/stub-gen/generator.ts
index a902976..b809f3f 100644
--- a/src/stub-gen/generator.ts
+++ b/src/stub-gen/generator.ts
@@ -108,9 +108,9 @@ function generateDocProperty(name: string, p: IDocProperty, comments?: string[])
     } else if (p.table) {
         code += `${_LT(p.type)}[]`; // Lua table
     } else if (p.nestedArray) {
-        // TODO: Implement
+        code += `vector|table<integer, vector|${_LT(p.type)}[]>`; // nestedArray
     } else if (p.nestedTable) {
-        // TODO: Implement
+        code += `table<integer, vector|${_LT(p.type)}[]>`; // nestedTable
     } else {
         code += `${_LT(p.type)}`;
     }
@@ -139,14 +139,14 @@ function generateDocParam(name: string, p: IDocParam) {
         } else if (p.table) {
             code += `${_LT(p.type)}[]`; // Lua table
         } else if (p.nestedArray) {
-            // TODO: Implement
+            code += `vector|table<integer, vector|${_LT(p.type)}[]>`; // nestedArray
         } else if (p.nestedTable) {
-            // TODO: Implement
+            code += `table<integer, vector|${_LT(p.type)}[]>`; // nestedTable
         } else {
             code += `${_LT(p.type)}`;
         }
 
-        if (p.nullable) {
+        if (p.nullable || p.default) {
             code += '|nil';
         }
     }
@@ -178,9 +178,9 @@ function generateDocReturn(returns: IDocType | IDocType[], comments?: string[])
         } else if (r.table) {
             code += `${_LT(r.type)}[]`; // Lua table
         } else if (r.nestedArray) {
-            // TODO: Implement
+            code += `vector|table<integer, vector|${_LT(r.type)}[]>`; // nestedArray
         } else if (r.nestedTable) {
-            // TODO: Implement
+            code += `table<integer, vector|${_LT(r.type)}[]>`; // nestedTable
         } else {
             code += `${_LT(r.type)}`;
         }