diff --git a/lib/tomlrb/generated_parser.rb b/lib/tomlrb/generated_parser.rb
index 70ab368..bb665af 100644
--- a/lib/tomlrb/generated_parser.rb
+++ b/lib/tomlrb/generated_parser.rb
@@ -10,100 +10,118 @@ class GeneratedParser < Racc::Parser
 ##### State transition tables begin ###
 
 racc_action_table = [
-     2,    45,    16,    56,    17,    44,    18,    55,    23,    19,
-    20,    14,    21,    22,     8,     4,    10,    36,    16,    12,
-    17,    48,    18,    46,    47,    19,    20,    42,    21,    22,
-    50,    51,    87,    86,    39,    54,    39,    72,    73,    74,
-    75,    70,    71,    67,    68,    65,    66,    69,    78,   nil,
-    59,   nil,   nil,    12,    72,    73,    74,    75,    70,    71,
-    67,    68,    65,    66,    69,   nil,   nil,    59,   nil,   nil,
-    12,    72,    73,    74,    75,    70,    71,    67,    68,    65,
-    66,    69,    91,   nil,    59,    89,   nil,    12,    72,    73,
-    74,    75,    70,    71,    67,    68,    65,    66,    69,    91,
-   nil,    59,    89,   nil,    12,    72,    73,    74,    75,    70,
-    71,    67,    68,    65,    66,    69,    91,   nil,    59,    89,
-   nil,    12,    72,    73,    74,    75,    70,    71,    67,    68,
-    65,    66,    69,    91,   nil,    59,    89,    29,    12,    30,
-   nil,    31,   nil,   nil,    32,    33,    27,    34,    35,    29,
-   nil,    30,    25,    31,   nil,   nil,    32,    33,    81,    34,
-    35,    16,   nil,    17,    25,    18,   nil,   nil,    19,    20,
-    77,    21,    22,    16,   nil,    17,   nil,    18,   nil,   nil,
-    19,    20,    42,    21,    22,    16,   nil,    17,   nil,    18,
-   nil,   nil,    19,    20,    85,    21,    22,    95,   nil,   nil,
-    93,   nil,   nil,   nil,    94 ]
+     2,    49,    16,    25,    17,    48,    18,    23,    24,    19,
+    20,    14,    21,    22,     8,     4,    10,    60,    16,    12,
+    17,    59,    18,    23,    24,    19,    20,    46,    21,    22,
+    28,    51,    54,    53,    54,    84,    43,    77,    78,    79,
+    80,    75,    76,    72,    73,    70,    71,    74,    93,    92,
+    63,    40,    55,    12,    77,    78,    79,    80,    75,    76,
+    72,    73,    70,    71,    74,    43,    58,    63,    87,    87,
+    12,    77,    78,    79,    80,    75,    76,    72,    73,    70,
+    71,    74,    54,   nil,    63,    98,   nil,    12,    77,    78,
+    79,    80,    75,    76,    72,    73,    70,    71,    74,    87,
+   nil,    63,   111,   nil,    12,    77,    78,    79,    80,    75,
+    76,    72,    73,    70,    71,    74,    54,   nil,    63,    98,
+   nil,    12,    77,    78,    79,    80,    75,    76,    72,    73,
+    70,    71,    74,    54,   nil,    63,    98,   nil,    12,    77,
+    78,    79,    80,    75,    76,    72,    73,    70,    71,    74,
+    87,   nil,    63,   111,    31,    12,    32,   nil,    33,    38,
+    39,    34,    35,    29,    36,    37,    16,   nil,    17,    28,
+    18,    23,    24,    19,    20,    82,    21,    22,    31,   nil,
+    32,   nil,    33,    38,    39,    34,    35,    86,    36,    37,
+    16,   nil,    17,   nil,    18,    23,    24,    19,    20,    46,
+    21,    22,    16,   nil,    17,   nil,    18,    23,    24,    19,
+    20,    91,    21,    22,    54,    54,    87,    98,    98,   111,
+   nil,   109,   109,   118 ]
 
 racc_action_check = [
-     1,    13,     1,    41,     1,    13,     1,    41,     2,     1,
-     1,     1,     1,     1,     1,     1,     1,    10,    11,     1,
-    11,    25,    11,    24,    24,    11,    11,    11,    11,    11,
-    26,    26,    57,    57,    38,    40,    11,    44,    44,    44,
-    44,    44,    44,    44,    44,    44,    44,    44,    50,   nil,
-    44,   nil,   nil,    44,    55,    55,    55,    55,    55,    55,
-    55,    55,    55,    55,    55,   nil,   nil,    55,   nil,   nil,
-    55,    58,    58,    58,    58,    58,    58,    58,    58,    58,
-    58,    58,    58,   nil,    58,    58,   nil,    58,    91,    91,
-    91,    91,    91,    91,    91,    91,    91,    91,    91,    91,
-   nil,    91,    91,   nil,    91,    94,    94,    94,    94,    94,
-    94,    94,    94,    94,    94,    94,    94,   nil,    94,    94,
-   nil,    94,    95,    95,    95,    95,    95,    95,    95,    95,
-    95,    95,    95,    95,   nil,    95,    95,     9,    95,     9,
-   nil,     9,   nil,   nil,     9,     9,     9,     9,     9,    51,
-   nil,    51,     9,    51,   nil,   nil,    51,    51,    51,    51,
-    51,    45,   nil,    45,    51,    45,   nil,   nil,    45,    45,
-    45,    45,    45,    54,   nil,    54,   nil,    54,   nil,   nil,
-    54,    54,    54,    54,    54,    56,   nil,    56,   nil,    56,
-   nil,   nil,    56,    56,    56,    56,    56,    90,   nil,   nil,
-    90,   nil,   nil,   nil,    90 ]
+     1,    13,     1,     2,     1,    13,     1,     1,     1,     1,
+     1,     1,     1,     1,     1,     1,     1,    45,    11,     1,
+    11,    45,    11,    11,    11,    11,    11,    11,    11,    11,
+    26,    26,    27,    27,    50,    50,    11,    48,    48,    48,
+    48,    48,    48,    48,    48,    48,    48,    48,    61,    61,
+    48,    10,    28,    48,    59,    59,    59,    59,    59,    59,
+    59,    59,    59,    59,    59,    42,    44,    59,    52,    83,
+    59,    62,    62,    62,    62,    62,    62,    62,    62,    62,
+    62,    62,    62,   nil,    62,    62,   nil,    62,    96,    96,
+    96,    96,    96,    96,    96,    96,    96,    96,    96,    96,
+   nil,    96,    96,   nil,    96,   105,   105,   105,   105,   105,
+   105,   105,   105,   105,   105,   105,   105,   nil,   105,   105,
+   nil,   105,   112,   112,   112,   112,   112,   112,   112,   112,
+   112,   112,   112,   112,   nil,   112,   112,   nil,   112,   116,
+   116,   116,   116,   116,   116,   116,   116,   116,   116,   116,
+   116,   nil,   116,   116,     9,   116,     9,   nil,     9,     9,
+     9,     9,     9,     9,     9,     9,    49,   nil,    49,     9,
+    49,    49,    49,    49,    49,    49,    49,    49,    51,   nil,
+    51,   nil,    51,    51,    51,    51,    51,    51,    51,    51,
+    58,   nil,    58,   nil,    58,    58,    58,    58,    58,    58,
+    58,    58,    60,   nil,    60,   nil,    60,    60,    60,    60,
+    60,    60,    60,    60,    94,   104,   108,    94,   104,   108,
+   nil,    94,   104,   108 ]
 
 racc_action_pointer = [
-   nil,     0,     8,   nil,   nil,   nil,   nil,   nil,   nil,   135,
-     1,    16,   nil,   -17,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     9,     4,    13,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    14,   nil,
-    14,   -15,   nil,   nil,    34,   159,   nil,   nil,   nil,   nil,
-    31,   147,   nil,   nil,   171,    51,   183,    18,    68,   nil,
+   nil,     0,     3,   nil,   nil,   nil,   nil,   nil,   nil,   152,
+    35,    16,   nil,   -17,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    13,    18,    35,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    45,   nil,    45,    -1,   nil,   nil,    34,   164,
+    20,   176,    54,   nil,   nil,   nil,   nil,   nil,   188,    51,
+   200,    34,    68,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   183,    85,   nil,   nil,   102,   119,   nil,   nil,   nil ]
+   nil,   nil,   nil,    55,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   200,   nil,    85,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   201,   102,   nil,   nil,   202,   nil,
+   nil,   nil,   119,   nil,   nil,   nil,   136,   nil,   nil,   nil,
+   nil ]
 
 racc_action_default = [
-    -1,   -79,   -79,    -2,    -3,    -4,    -5,    -6,    -7,   -79,
-   -11,   -79,   -31,   -79,   -45,   -46,   -47,   -48,   -49,   -50,
-   -51,   -52,   -53,    99,   -79,   -13,   -79,   -20,   -21,   -22,
-   -23,   -24,   -25,   -26,   -27,   -28,   -10,   -29,   -79,   -32,
-   -33,   -79,   -39,   -40,   -67,   -79,    -8,    -9,   -12,   -14,
-   -16,   -79,   -30,   -34,   -79,   -67,   -79,   -79,   -67,   -61,
-   -62,   -63,   -64,   -65,   -66,   -68,   -69,   -70,   -71,   -72,
-   -73,   -74,   -75,   -76,   -77,   -78,   -43,   -44,   -15,   -17,
-   -18,   -19,   -35,   -36,   -37,   -38,   -41,   -42,   -54,   -55,
-   -79,   -67,   -56,   -58,   -67,   -67,   -57,   -59,   -60 ]
+    -1,   -97,   -97,    -2,    -3,    -4,    -5,    -6,    -7,   -97,
+   -13,   -97,   -31,   -97,   -45,   -46,   -47,   -48,   -49,   -50,
+   -51,   -52,   -53,   -54,   -55,   121,   -97,   -97,   -15,   -18,
+   -19,   -20,   -21,   -22,   -23,   -24,   -25,   -26,   -27,   -28,
+   -12,   -29,   -97,   -32,   -33,   -97,   -39,   -40,   -84,   -97,
+   -97,   -97,   -10,   -11,   -73,   -14,   -30,   -34,   -97,   -84,
+   -97,   -97,   -97,   -67,   -74,   -75,   -76,   -80,   -81,   -85,
+   -86,   -87,   -88,   -89,   -90,   -91,   -92,   -93,   -94,   -95,
+   -96,   -43,   -44,    -8,    -9,   -16,   -17,   -72,   -35,   -36,
+   -37,   -38,   -41,   -42,   -97,   -60,   -97,   -62,   -69,   -77,
+   -78,   -79,   -82,   -83,   -97,   -97,   -59,   -64,   -97,   -71,
+   -61,   -68,   -97,   -57,   -63,   -58,   -97,   -66,   -70,   -56,
+   -65 ]
 
 racc_goto_table = [
-    15,    24,    38,    88,    28,    37,    57,     1,     3,     5,
-     6,     7,     9,    49,    53,    13,    92,    83,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    52,   nil,   nil,   nil,    96,   nil,   nil,    97,
-    98,   nil,   nil,    79,    76,    82,    80,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    84 ]
+    52,    15,    97,     7,    42,    95,    61,    41,    27,    65,
+    30,    67,     1,    69,     3,     5,   105,    89,   107,     6,
+    65,     9,    67,    83,    69,    50,   112,    26,   114,    57,
+    13,    94,   104,   nil,   nil,    96,   110,   106,    56,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   113,   115,    81,
+    66,    88,    85,   nil,   nil,   119,   120,   nil,   nil,   nil,
+    90,    66,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   116,   nil,
+   nil,   nil,   nil,   nil,   nil,   116 ]
 
 racc_goto_check = [
-    18,     7,    13,    22,    10,    12,    17,     1,     2,     3,
-     4,     5,     6,     9,    15,    19,    23,    17,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    12,   nil,   nil,   nil,    22,   nil,   nil,    22,
-    22,   nil,   nil,     7,    18,    13,    10,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    18 ]
+     9,    18,    26,     5,    13,    25,    17,    12,     8,    20,
+    10,    30,     1,    32,     2,     3,    24,    17,    27,     4,
+    20,     6,    30,     9,    32,     8,    24,     7,    27,    15,
+    19,    22,    23,   nil,   nil,     9,    26,    25,    12,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,    25,    25,    18,
+     5,    13,    10,   nil,   nil,    25,    26,   nil,   nil,   nil,
+    18,     5,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     9,   nil,
+   nil,   nil,   nil,   nil,   nil,     9 ]
 
 racc_goto_pointer = [
-   nil,     7,     7,     8,     9,    10,    11,    -8,   nil,   -13,
-    -5,   nil,    -6,    -9,   nil,   -26,   nil,   -38,    -1,    14,
-   nil,   nil,   -55,   -74,   nil,   nil,   nil ]
+   nil,    12,    13,    14,    18,     2,    20,    18,    -1,   -27,
+     1,   nil,    -4,    -7,   nil,   -15,   nil,   -42,     0,    29,
+   -39,   nil,   -31,   -62,   -78,   -57,   -60,   -76,   nil,   nil,
+   -37,   nil,   -35 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,    62,   nil,   nil,    26,   nil,
-   nil,    11,   nil,   nil,    40,   nil,    41,    90,    43,   nil,
-    61,    58,   nil,   nil,    60,    63,    64 ]
+   nil,   nil,   nil,   nil,   nil,   101,   nil,   nil,   nil,   108,
+   nil,    11,   nil,   nil,    44,   nil,    45,   nil,    47,   nil,
+   100,    62,   nil,   nil,   nil,   nil,   117,   nil,    64,    99,
+   102,    68,   103 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
@@ -114,27 +132,27 @@ class GeneratedParser < Racc::Parser
   1, 25, :_reduce_none,
   1, 25, :_reduce_none,
   1, 25, :_reduce_none,
+  4, 26, :_reduce_none,
+  4, 26, :_reduce_none,
   3, 26, :_reduce_none,
   3, 26, :_reduce_none,
-  2, 29, :_reduce_10,
-  1, 29, :_reduce_11,
-  2, 30, :_reduce_12,
-  1, 30, :_reduce_13,
-  2, 30, :_reduce_none,
-  2, 32, :_reduce_15,
-  1, 32, :_reduce_16,
-  2, 32, :_reduce_none,
-  3, 31, :_reduce_18,
-  3, 31, :_reduce_19,
-  1, 31, :_reduce_20,
-  1, 31, :_reduce_21,
+  2, 29, :_reduce_12,
+  1, 29, :_reduce_13,
+  2, 31, :_reduce_14,
+  1, 31, :_reduce_15,
+  3, 30, :_reduce_16,
+  3, 30, :_reduce_17,
+  1, 30, :_reduce_18,
+  1, 30, :_reduce_19,
   1, 33, :_reduce_none,
-  1, 33, :_reduce_23,
+  1, 33, :_reduce_21,
   1, 33, :_reduce_none,
   1, 33, :_reduce_none,
   1, 33, :_reduce_none,
   1, 33, :_reduce_none,
   1, 33, :_reduce_none,
+  1, 33, :_reduce_27,
+  1, 33, :_reduce_28,
   2, 28, :_reduce_none,
   3, 28, :_reduce_none,
   1, 34, :_reduce_31,
@@ -160,35 +178,53 @@ class GeneratedParser < Racc::Parser
   1, 41, :_reduce_none,
   1, 41, :_reduce_none,
   1, 41, :_reduce_none,
+  1, 41, :_reduce_54,
+  1, 41, :_reduce_55,
+  5, 43, :_reduce_none,
+  4, 43, :_reduce_none,
+  4, 43, :_reduce_none,
+  3, 43, :_reduce_none,
   2, 43, :_reduce_none,
-  1, 45, :_reduce_55,
   2, 45, :_reduce_none,
-  2, 45, :_reduce_none,
-  1, 46, :_reduce_58,
-  2, 46, :_reduce_none,
+  1, 45, :_reduce_none,
   2, 46, :_reduce_none,
-  1, 44, :_reduce_61,
-  1, 40, :_reduce_62,
+  1, 46, :_reduce_none,
+  3, 50, :_reduce_none,
+  2, 50, :_reduce_none,
+  1, 44, :_reduce_67,
+  2, 48, :_reduce_68,
+  1, 48, :_reduce_69,
+  2, 47, :_reduce_none,
+  1, 47, :_reduce_none,
+  2, 32, :_reduce_none,
+  1, 32, :_reduce_none,
+  1, 40, :_reduce_74,
   1, 40, :_reduce_none,
   1, 40, :_reduce_none,
-  1, 47, :_reduce_none,
-  1, 47, :_reduce_none,
-  0, 49, :_reduce_none,
-  1, 49, :_reduce_68,
-  1, 49, :_reduce_69,
-  1, 49, :_reduce_70,
-  1, 49, :_reduce_71,
-  1, 49, :_reduce_72,
-  1, 49, :_reduce_73,
-  1, 49, :_reduce_74,
-  1, 48, :_reduce_75,
-  1, 48, :_reduce_76,
-  1, 48, :_reduce_77,
-  1, 48, :_reduce_78 ]
-
-racc_reduce_n = 79
-
-racc_shift_n = 99
+  1, 49, :_reduce_77,
+  1, 49, :_reduce_none,
+  1, 49, :_reduce_none,
+  1, 51, :_reduce_none,
+  1, 51, :_reduce_none,
+  1, 52, :_reduce_none,
+  1, 52, :_reduce_none,
+  0, 54, :_reduce_none,
+  1, 54, :_reduce_none,
+  1, 55, :_reduce_86,
+  1, 55, :_reduce_87,
+  1, 55, :_reduce_88,
+  1, 55, :_reduce_89,
+  1, 55, :_reduce_90,
+  1, 55, :_reduce_91,
+  1, 55, :_reduce_92,
+  1, 53, :_reduce_93,
+  1, 53, :_reduce_94,
+  1, 53, :_reduce_95,
+  1, 53, :_reduce_96 ]
+
+racc_reduce_n = 97
+
+racc_shift_n = 121
 
 racc_token_table = {
   false => 0,
@@ -267,9 +303,9 @@ class GeneratedParser < Racc::Parser
   "assignment",
   "inline_table",
   "table_start",
-  "table_continued",
   "table_identifier",
-  "table_next",
+  "table_end",
+  "newlines",
   "table_identifier_component",
   "inline_table_start",
   "inline_table_end",
@@ -282,11 +318,17 @@ class GeneratedParser < Racc::Parser
   "assignment_key",
   "array",
   "start_array",
-  "array_continued",
-  "array_next",
+  "array_first_value",
+  "array_values",
+  "comma",
+  "end_array",
+  "non_nil_value",
+  "array_value",
   "scalar",
+  "non_nil_scalar",
   "string",
-  "literal" ]
+  "literal",
+  "non_nil_literal" ]
 Ractor.make_shareable(Racc_token_to_s_table) if defined?(Ractor)
 
 Racc_debug_parser = false
@@ -313,68 +355,54 @@ class GeneratedParser < Racc::Parser
 
 # reduce 9 omitted
 
-module_eval(<<'.,.,', 'parser.y', 18)
-  def _reduce_10(val, _values, result)
-     @handler.start_(:array_of_tables)
-    result
-  end
-.,.,
+# reduce 10 omitted
 
-module_eval(<<'.,.,', 'parser.y', 19)
-  def _reduce_11(val, _values, result)
-     @handler.start_(:table)
-    result
-  end
-.,.,
+# reduce 11 omitted
 
-module_eval(<<'.,.,', 'parser.y', 22)
+module_eval(<<'.,.,', 'parser.y', 20)
   def _reduce_12(val, _values, result)
-     array = @handler.end_(:array_of_tables); @handler.set_context(array, is_array_of_tables: true)
+     @handler.start_(:array_of_tables)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 23)
+module_eval(<<'.,.,', 'parser.y', 21)
   def _reduce_13(val, _values, result)
-     array = @handler.end_(:table); @handler.set_context(array)
+     @handler.start_(:table)
     result
   end
 .,.,
 
-# reduce 14 omitted
-
-module_eval(<<'.,.,', 'parser.y', 27)
-  def _reduce_15(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 25)
+  def _reduce_14(val, _values, result)
      array = @handler.end_(:array_of_tables); @handler.set_context(array, is_array_of_tables: true)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 28)
-  def _reduce_16(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 26)
+  def _reduce_15(val, _values, result)
      array = @handler.end_(:table); @handler.set_context(array)
     result
   end
 .,.,
 
-# reduce 17 omitted
-
-module_eval(<<'.,.,', 'parser.y', 32)
-  def _reduce_18(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 29)
+  def _reduce_16(val, _values, result)
      @handler.push(val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 33)
-  def _reduce_19(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 30)
+  def _reduce_17(val, _values, result)
      val[2].split('.').each { |k| @handler.push(k) }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 35)
-  def _reduce_20(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 32)
+  def _reduce_18(val, _values, result)
           keys = val[0].split('.')
       @handler.start_(:table)
       keys.each { |key| @handler.push(key) }
@@ -383,44 +411,58 @@ def _reduce_20(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 39)
-  def _reduce_21(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 36)
+  def _reduce_19(val, _values, result)
      @handler.push(val[0])
     result
   end
 .,.,
 
-# reduce 22 omitted
+# reduce 20 omitted
 
-module_eval(<<'.,.,', 'parser.y', 43)
-  def _reduce_23(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 40)
+  def _reduce_21(val, _values, result)
      result = StringUtils.replace_escaped_chars(val[0])
     result
   end
 .,.,
 
+# reduce 22 omitted
+
+# reduce 23 omitted
+
 # reduce 24 omitted
 
 # reduce 25 omitted
 
 # reduce 26 omitted
 
-# reduce 27 omitted
+module_eval(<<'.,.,', 'parser.y', 46)
+  def _reduce_27(val, _values, result)
+     result = val[0][0]
+    result
+  end
+.,.,
 
-# reduce 28 omitted
+module_eval(<<'.,.,', 'parser.y', 47)
+  def _reduce_28(val, _values, result)
+     result = val[0][0]
+    result
+  end
+.,.,
 
 # reduce 29 omitted
 
 # reduce 30 omitted
 
-module_eval(<<'.,.,', 'parser.y', 55)
+module_eval(<<'.,.,', 'parser.y', 54)
   def _reduce_31(val, _values, result)
      @handler.start_(:inline)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 59)
+module_eval(<<'.,.,', 'parser.y', 58)
   def _reduce_32(val, _values, result)
           array = @handler.end_(:inline)
       @handler.push_inline(array)
@@ -435,7 +477,7 @@ def _reduce_32(val, _values, result)
 
 # reduce 35 omitted
 
-module_eval(<<'.,.,', 'parser.y', 72)
+module_eval(<<'.,.,', 'parser.y', 71)
   def _reduce_36(val, _values, result)
           keys = @handler.end_(:inline_keys)
       @handler.push(keys)
@@ -444,7 +486,7 @@ def _reduce_36(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 78)
+module_eval(<<'.,.,', 'parser.y', 77)
   def _reduce_37(val, _values, result)
           @handler.push(val[2]) 
 
@@ -452,14 +494,14 @@ def _reduce_37(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 80)
+module_eval(<<'.,.,', 'parser.y', 79)
   def _reduce_38(val, _values, result)
      val[2].split('.').each { |k| @handler.push(k) }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 82)
+module_eval(<<'.,.,', 'parser.y', 81)
   def _reduce_39(val, _values, result)
           keys = val[0].split('.')
       @handler.start_(:inline_keys)
@@ -469,7 +511,7 @@ def _reduce_39(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 87)
+module_eval(<<'.,.,', 'parser.y', 86)
   def _reduce_40(val, _values, result)
           @handler.start_(:inline_keys) 
       @handler.push(val[0]) 
@@ -478,7 +520,7 @@ def _reduce_40(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 93)
+module_eval(<<'.,.,', 'parser.y', 92)
   def _reduce_41(val, _values, result)
           keys = @handler.end_(:keys)
       value = keys.pop
@@ -490,7 +532,7 @@ def _reduce_41(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 100)
+module_eval(<<'.,.,', 'parser.y', 99)
   def _reduce_42(val, _values, result)
           keys = @handler.end_(:keys)
       value = keys.pop
@@ -502,21 +544,21 @@ def _reduce_42(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 108)
+module_eval(<<'.,.,', 'parser.y', 107)
   def _reduce_43(val, _values, result)
      @handler.push(val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 109)
+module_eval(<<'.,.,', 'parser.y', 108)
   def _reduce_44(val, _values, result)
      val[2].split('.').each { |k| @handler.push(k) }
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 111)
+module_eval(<<'.,.,', 'parser.y', 110)
   def _reduce_45(val, _values, result)
           keys = val[0].split('.')
       @handler.start_(:keys)
@@ -526,7 +568,7 @@ def _reduce_45(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 115)
+module_eval(<<'.,.,', 'parser.y', 114)
   def _reduce_46(val, _values, result)
      @handler.start_(:keys); @handler.push(val[0])
     result
@@ -535,7 +577,7 @@ def _reduce_46(val, _values, result)
 
 # reduce 47 omitted
 
-module_eval(<<'.,.,', 'parser.y', 119)
+module_eval(<<'.,.,', 'parser.y', 118)
   def _reduce_48(val, _values, result)
      result = StringUtils.replace_escaped_chars(val[0])
     result
@@ -552,11 +594,16 @@ def _reduce_48(val, _values, result)
 
 # reduce 53 omitted
 
-# reduce 54 omitted
+module_eval(<<'.,.,', 'parser.y', 124)
+  def _reduce_54(val, _values, result)
+     result = val[0][0]
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'parser.y', 130)
+module_eval(<<'.,.,', 'parser.y', 125)
   def _reduce_55(val, _values, result)
-     array = @handler.end_(:array); @handler.push(array.compact)
+     result = val[0][0]
     result
   end
 .,.,
@@ -565,50 +612,96 @@ def _reduce_55(val, _values, result)
 
 # reduce 57 omitted
 
-module_eval(<<'.,.,', 'parser.y', 135)
-  def _reduce_58(val, _values, result)
+# reduce 58 omitted
+
+# reduce 59 omitted
+
+# reduce 60 omitted
+
+# reduce 61 omitted
+
+# reduce 62 omitted
+
+# reduce 63 omitted
+
+# reduce 64 omitted
+
+# reduce 65 omitted
+
+# reduce 66 omitted
+
+module_eval(<<'.,.,', 'parser.y', 147)
+  def _reduce_67(val, _values, result)
+     @handler.start_(:array)
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'parser.y', 150)
+  def _reduce_68(val, _values, result)
      array = @handler.end_(:array); @handler.push(array.compact)
     result
   end
 .,.,
 
-# reduce 59 omitted
+module_eval(<<'.,.,', 'parser.y', 151)
+  def _reduce_69(val, _values, result)
+     array = @handler.end_(:array); @handler.push(array.compact)
+    result
+  end
+.,.,
 
-# reduce 60 omitted
+# reduce 70 omitted
 
-module_eval(<<'.,.,', 'parser.y', 140)
-  def _reduce_61(val, _values, result)
-     @handler.start_(:array)
+# reduce 71 omitted
+
+# reduce 72 omitted
+
+# reduce 73 omitted
+
+module_eval(<<'.,.,', 'parser.y', 162)
+  def _reduce_74(val, _values, result)
+     @handler.push(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 143)
-  def _reduce_62(val, _values, result)
+# reduce 75 omitted
+
+# reduce 76 omitted
+
+module_eval(<<'.,.,', 'parser.y', 167)
+  def _reduce_77(val, _values, result)
      @handler.push(val[0])
     result
   end
 .,.,
 
-# reduce 63 omitted
+# reduce 78 omitted
 
-# reduce 64 omitted
+# reduce 79 omitted
 
-# reduce 65 omitted
+# reduce 80 omitted
 
-# reduce 66 omitted
+# reduce 81 omitted
 
-# reduce 67 omitted
+# reduce 82 omitted
 
-module_eval(<<'.,.,', 'parser.y', 152)
-  def _reduce_68(val, _values, result)
+# reduce 83 omitted
+
+# reduce 84 omitted
+
+# reduce 85 omitted
+
+module_eval(<<'.,.,', 'parser.y', 183)
+  def _reduce_86(val, _values, result)
      result = val[0].to_f
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 154)
-  def _reduce_69(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 185)
+  def _reduce_87(val, _values, result)
           v = val[0]
       result = if v.end_with?('nan')
                  Float::NAN
@@ -620,15 +713,15 @@ def _reduce_69(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 161)
-  def _reduce_70(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 192)
+  def _reduce_88(val, _values, result)
      result = val[0].to_i
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 163)
-  def _reduce_71(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 194)
+  def _reduce_89(val, _values, result)
           base = case val[0][1]
              when 'x' then 16
              when 'o' then 8
@@ -640,65 +733,68 @@ def _reduce_71(val, _values, result)
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 170)
-  def _reduce_72(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 201)
+  def _reduce_90(val, _values, result)
      result = val[0] == 'true' ? true : false
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 172)
-  def _reduce_73(val, _values, result)
-          v = val[0]
-      result = if v[6].nil?
-                 if v[4].nil?
-                   LocalDate.new(v[0], v[1], v[2])
+module_eval(<<'.,.,', 'parser.y', 203)
+  def _reduce_91(val, _values, result)
+          _str, year, month, day, hour, min, sec, offset = val[0]
+      result = if offset.nil?
+                 if hour.nil?
+                   LocalDate.new(year, month, day)
                  else
-                   LocalDateTime.new(v[0], v[1], v[2], v[3] || 0, v[4] || 0, v[5].to_f)
+                   LocalDateTime.new(year, month, day, hour, min || 0, sec.to_f)
                  end
                else
                  # Patch for 24:00:00 which Ruby parses
-                 if v[3].to_i == 24 && v[4].to_i == 0 && v[5].to_i == 0
-                   v[3] = (v[3].to_i + 1).to_s
+                 if hour.to_i == 24 && min.to_i == 0 && sec.to_i == 0
+                   hour = (hour.to_i + 1).to_s
                  end
 
-                 Time.new(v[0], v[1], v[2], v[3] || 0, v[4] || 0, v[5].to_f, v[6])
+                 time = Time.new(year, month, day, hour || 0, min || 0, sec.to_f, offset)
+                 # Should be out of parser.y?
+                 raise ArgumentError, "Invalid Offset Date-Time: #{year}-#{month}-#{day}T#{hour}:#{min}:#{sec}#{offset}" unless min.to_i == time.min && hour.to_i == time.hour && day.to_i == time.day && month.to_i == time.month && year.to_i == time.year
+                 time
                end
 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 188)
-  def _reduce_74(val, _values, result)
-     result = LocalTime.new(*val[0])
+module_eval(<<'.,.,', 'parser.y', 222)
+  def _reduce_92(val, _values, result)
+     result = LocalTime.new(*val[0][1..-1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 191)
-  def _reduce_75(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 225)
+  def _reduce_93(val, _values, result)
      result = StringUtils.replace_escaped_chars(StringUtils.multiline_replacements(val[0]))
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 192)
-  def _reduce_76(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 226)
+  def _reduce_94(val, _values, result)
      result = StringUtils.replace_escaped_chars(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 193)
-  def _reduce_77(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 227)
+  def _reduce_95(val, _values, result)
      result = StringUtils.strip_spaces(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'parser.y', 194)
-  def _reduce_78(val, _values, result)
+module_eval(<<'.,.,', 'parser.y', 228)
+  def _reduce_96(val, _values, result)
      result = val[0]
     result
   end
diff --git a/lib/tomlrb/handler.rb b/lib/tomlrb/handler.rb
index a7a0f3e..c6959ea 100644
--- a/lib/tomlrb/handler.rb
+++ b/lib/tomlrb/handler.rb
@@ -72,16 +72,21 @@ def push(o)
 
     def push_inline(inline_arrays)
       merged_inline = {}
+      keys = Keys.new
 
       inline_arrays.each do |inline_array|
         current = merged_inline
         value = inline_array.pop
+        keys.add_table_key inline_array, value.is_a?(Array)
+
         inline_array.each_with_index do |inline_key, inline_index|
           inline_key = inline_key.to_sym if @symbolize_keys
           last_key = inline_index == inline_array.size - 1
 
           if last_key
             if current[inline_key].nil?
+              keys.add_pair_key [inline_key], []
+
               current[inline_key] = value
             else
               raise Key::KeyConflict, "Inline key #{inline_key} is already used"
@@ -119,10 +124,14 @@ def validate_value(value)
     private
 
     def assign_key_path(current, key, key_emptied)
+      existed = current.key?(key)
+      raise ParseError, "Cannot overwrite value with key #{key}" if existed && !current[key].is_a?(Hash)
       if key_emptied
         raise ParseError, "Cannot overwrite value with key #{key}" unless current.is_a?(Hash)
 
-        current[key] = @stack.pop
+        value = @stack.pop
+        raise ParseError, "Cannot overwrite value with key #{key}" if current[key].is_a?(Hash) && !value.is_a?(Hash)
+        current[key] = value
         return current
       end
       current[key] ||= {}
@@ -175,6 +184,7 @@ def find_or_create_first_table_key(current, key, declared, is_array_of_tables)
         raise Key::KeyConflict, "Key #{key} is already used"
       end
       k = existed || Key.new(key, :table, declared)
+      k.declared = k.declared? || declared
       current[key] = k
       k
     end
@@ -206,6 +216,7 @@ class Key
     class KeyConflict < ParseError; end
 
     attr_reader :key, :type
+    attr_writer :declared
 
     def initialize(key, type, declared = false)
       @key = key
diff --git a/lib/tomlrb/local_date.rb b/lib/tomlrb/local_date.rb
index 8c8d786..d2201bd 100644
--- a/lib/tomlrb/local_date.rb
+++ b/lib/tomlrb/local_date.rb
@@ -9,7 +9,8 @@ class LocalDate
     def_delegators :@time, :year, :month, :day
 
     def initialize(year, month, day)
-      @time = Time.new(year, month, day, 0, 0, 0, '-00:00')
+      @time = Time.utc(year, month, day, 0, 0, 0)
+      raise ArgumentError, "Invalid Local Date: #{year}-#{month}-#{day}" unless day.to_i == @time.day && month.to_i == @time.month && year.to_i == @time.year
     end
 
     # @param offset see {LocalDateTime#to_time}
diff --git a/lib/tomlrb/local_date_time.rb b/lib/tomlrb/local_date_time.rb
index 2bbd373..27ef91b 100644
--- a/lib/tomlrb/local_date_time.rb
+++ b/lib/tomlrb/local_date_time.rb
@@ -9,7 +9,9 @@ class LocalDateTime
     def_delegators :@time, :year, :month, :day, :hour, :min, :sec, :usec, :nsec
 
     def initialize(year, month, day, hour, min, sec) # rubocop:disable Metrics/ParameterLists
-      @time = Time.new(year, month, day, hour, min, sec, '-00:00')
+      @time = Time.utc(year, month, day, hour, min, sec)
+      raise ArgumentError, "Invalid Local Date-Time: #{year}-#{month}-#{day}T#{hour}:#{min}:#{sec}" unless min.to_i == @time.min && hour.to_i == @time.hour && day.to_i == @time.day && month.to_i == @time.month && year.to_i == @time.year
+
       @sec = sec
     end
 
diff --git a/lib/tomlrb/local_time.rb b/lib/tomlrb/local_time.rb
index 95f9922..e240e2b 100644
--- a/lib/tomlrb/local_time.rb
+++ b/lib/tomlrb/local_time.rb
@@ -9,7 +9,8 @@ class LocalTime
     def_delegators :@time, :hour, :min, :sec, :usec, :nsec
 
     def initialize(hour, min, sec)
-      @time = Time.new(0, 1, 1, hour, min, sec, '-00:00')
+      @time = Time.utc(0, 1, 1, hour, min, sec)
+      raise ArgumentError, "Invalid Local Time: #{hour}-#{min}-#{sec}" unless min.to_i == @time.min && hour.to_i == @time.hour
       @sec = sec
     end
 
diff --git a/lib/tomlrb/parser.y b/lib/tomlrb/parser.y
index 579afe1..a4b6fd4 100644
--- a/lib/tomlrb/parser.y
+++ b/lib/tomlrb/parser.y
@@ -12,22 +12,19 @@ rule
     | NEWLINE
     ;
   table
-    : table_start table_continued NEWLINE
-    | table_start table_continued EOS
+    : table_start table_identifier table_end newlines
+    | table_start table_identifier table_end EOS
+    | table_start table_end newlines
+    | table_start table_end EOS
     ;
   table_start
     : '[' '[' { @handler.start_(:array_of_tables) }
     | '[' { @handler.start_(:table) }
     ;
-  table_continued
-    : ']' ']' { array = @handler.end_(:array_of_tables); @handler.set_context(array, is_array_of_tables: true) }
-    | ']' { array = @handler.end_(:table); @handler.set_context(array) }
-    | table_identifier table_next
     ;
-  table_next
+  table_end
     : ']' ']' { array = @handler.end_(:array_of_tables); @handler.set_context(array, is_array_of_tables: true) }
     | ']' { array = @handler.end_(:table); @handler.set_context(array) }
-    | '.' table_continued
     ;
   table_identifier
     : table_identifier '.' table_identifier_component { @handler.push(val[2]) }
@@ -47,6 +44,8 @@ rule
     | NON_DEC_INTEGER
     | FLOAT_KEYWORD
     | BOOLEAN
+    | DATETIME { result = val[0][0] }
+    | LOCAL_TIME { result = val[0][0] }
     ;
   inline_table
     : inline_table_start inline_table_end
@@ -123,34 +122,66 @@ rule
     | NON_DEC_INTEGER
     | FLOAT_KEYWORD
     | BOOLEAN
+    | DATETIME { result = val[0][0] }
+    | LOCAL_TIME { result = val[0][0] }
     ;
   array
-    : start_array array_continued
+    : start_array array_first_value array_values comma end_array
+    | start_array array_first_value array_values end_array
+    | start_array array_first_value comma end_array
+    | start_array array_first_value end_array
+    | start_array end_array
     ;
-  array_continued
-    : ']' { array = @handler.end_(:array); @handler.push(array.compact) }
-    | value array_next
-    | NEWLINE array_continued
+  array_first_value
+    : newlines non_nil_value
+    | non_nil_value
     ;
-  array_next
-    : ']' { array = @handler.end_(:array); @handler.push(array.compact) }
-    | ',' array_continued
-    | NEWLINE array_continued
+  array_values
+    : array_values array_value
+    | array_value
+    ;
+  array_value
+    : comma newlines non_nil_value
+    | comma non_nil_value
     ;
   start_array
     : '[' { @handler.start_(:array) }
     ;
+  end_array
+    : newlines ']' { array = @handler.end_(:array); @handler.push(array.compact) }
+    | ']' { array = @handler.end_(:array); @handler.push(array.compact) }
+    ;
+  comma
+    : newlines ','
+    | ','
+    ;
+  newlines
+    : newlines NEWLINE
+    | NEWLINE
+    ;
   value
     : scalar { @handler.push(val[0]) }
     | array
     | inline_table
     ;
+  non_nil_value
+    : non_nil_scalar { @handler.push(val[0]) }
+    | array
+    | inline_table
+    ;
   scalar
     : string
     | literal
     ;
+  non_nil_scalar
+    : string
+    | non_nil_literal
+    ;
   literal
-    | FLOAT { result = val[0].to_f }
+    | non_nil_literal
+    ;
+  non_nil_literal
+    : FLOAT { result = val[0].to_f }
     | FLOAT_KEYWORD {
       v = val[0]
       result = if v.end_with?('nan')
@@ -170,23 +201,26 @@ rule
     }
     | BOOLEAN { result = val[0] == 'true' ? true : false }
     | DATETIME {
-      v = val[0]
-      result = if v[6].nil?
-                 if v[4].nil?
-                   LocalDate.new(v[0], v[1], v[2])
+      _str, year, month, day, hour, min, sec, offset = val[0]
+      result = if offset.nil?
+                 if hour.nil?
+                   LocalDate.new(year, month, day)
                  else
-                   LocalDateTime.new(v[0], v[1], v[2], v[3] || 0, v[4] || 0, v[5].to_f)
+                   LocalDateTime.new(year, month, day, hour, min || 0, sec.to_f)
                  end
                else
                  # Patch for 24:00:00 which Ruby parses
-                 if v[3].to_i == 24 && v[4].to_i == 0 && v[5].to_i == 0
-                   v[3] = (v[3].to_i + 1).to_s
+                 if hour.to_i == 24 && min.to_i == 0 && sec.to_i == 0
+                   hour = (hour.to_i + 1).to_s
                  end
 
-                 Time.new(v[0], v[1], v[2], v[3] || 0, v[4] || 0, v[5].to_f, v[6])
+                 time = Time.new(year, month, day, hour || 0, min || 0, sec.to_f, offset)
+                 # Should be out of parser.y?
+                 raise ArgumentError, "Invalid Offset Date-Time: #{year}-#{month}-#{day}T#{hour}:#{min}:#{sec}#{offset}" unless min.to_i == time.min && hour.to_i == time.hour && day.to_i == time.day && month.to_i == time.month && year.to_i == time.year
+                 time
                end
     }
-    | LOCAL_TIME { result = LocalTime.new(*val[0]) }
+    | LOCAL_TIME { result = LocalTime.new(*val[0][1..-1]) }
     ;
   string
     : STRING_MULTI { result = StringUtils.replace_escaped_chars(StringUtils.multiline_replacements(val[0])) }
diff --git a/lib/tomlrb/scanner.rb b/lib/tomlrb/scanner.rb
index 4171f68..9951756 100644
--- a/lib/tomlrb/scanner.rb
+++ b/lib/tomlrb/scanner.rb
@@ -13,7 +13,7 @@ class Scanner
     NEWLINE =
       /(?:[ \t]*(?:\r?\n)[ \t]*)+/.freeze
     STRING_BASIC =
-      /(")(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F])*?\1/.freeze
+      /(")(?:\\?[^\u0000-\u0008\u000A-\u001F\u007F\\]|(?:\\[^\u0000-\u0008\u000A-\u001F\u007F]))*?\1/.freeze
     STRING_MULTI =
       /"{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?(?<!\\)"{3,5})/m.freeze
     STRING_LITERAL =
@@ -21,9 +21,9 @@ class Scanner
     STRING_LITERAL_MULTI =
       /'{3}([^\u0000-\u0008\u000B\u000C\u000E-\u001F\u007F]*?'{3,5})/m.freeze
     DATETIME =
-      /(-?\d{4})-(\d{2})-(\d{2})(?:(?:t|\s)(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?))?(z|[-+]\d{2}:\d{2})?/i.freeze
+      /(-?\d{4})-([01]\d)-([0-3]\d)(?:(?:t|\s)([0-2]\d):([0-5]\d):([0-6]\d(?:\.\d+)?))?(z|[-+][01]\d:\d{2})?/i.freeze
     LOCAL_TIME =
-      /(\d{2}):(\d{2}):(\d{2}(?:\.\d+)?)/.freeze
+      /([0-2]\d):([0-5]\d):([0-6]\d(?:\.\d+)?)/.freeze
     FLOAT =
       /[+-]?(?:(?:\d|[1-9](?:_?\d)*)\.\d(?:_?\d)*|\d+(?=[eE]))(?:[eE][+-]?[0-9]+(_[0-9])*[0-9]*)?(?!\w)/.freeze
     FLOAT_KEYWORD =
@@ -73,12 +73,12 @@ def next_token
 
     def process_datetime
       offset = @ss[7].gsub(/[zZ]/, '+00:00') if @ss[7]
-      args = [@ss[1], @ss[2], @ss[3], @ss[4], @ss[5], @ss[6], offset]
+      args = [@ss[0], @ss[1], @ss[2], @ss[3], @ss[4], @ss[5], @ss[6], offset]
       [:DATETIME, args]
     end
 
     def process_local_time
-      args = [@ss[1], @ss[2], @ss[3].to_f]
+      args = [@ss[0], @ss[1], @ss[2], @ss[3].to_f]
       [:LOCAL_TIME, args]
     end
 
diff --git a/test/test_compliance.rb b/test/test_compliance.rb
index 89c7f0e..477e754 100644
--- a/test/test_compliance.rb
+++ b/test/test_compliance.rb
@@ -25,6 +25,10 @@
 ]
 
 describe Tomlrb::Parser do
+  toml_test_list_file = File.join(__dir__, '../toml-test/tests/files-toml-1.0.0')
+  toml_test_list = File.readlines(toml_test_list_file, chomp: true)
+  toml_test_list_base = Pathname.new("toml-test/tests")
+
   tests_dirs = [
     File.join(__dir__, '../toml-spec-tests'),
     File.join(__dir__, '../toml-test/tests')
@@ -35,6 +39,16 @@
       local_path = toml_path.relative_path_from(Pathname.new(File.join(__dir__, '..')))
 
       it "parses #{local_path}" do
+        if ENV['CI'] == 'true' && RUBY_ENGINE == 'truffleruby' &&
+           local_path.to_path == 'toml-spec-tests/values/qa-table-inline-nested-1000.toml'
+          skip 'Skipping #{local_path} on TruffleRuby CI due to stack size limitations'
+        end
+
+        if tests_dir == File.join(__dir__, '../toml-test/tests')
+          path_in_list = local_path.relative_path_from(toml_test_list_base)
+          skip 'Skipping test for Toml 1.1' unless toml_test_list.include?(path_in_list.to_path)
+        end
+
         actual = Tomlrb.load_file(toml_path.to_path)
         json_path = toml_path.sub_ext('.json')
         yaml_path = toml_path.sub_ext('.yaml')
@@ -52,8 +66,13 @@
       toml_path = toml_path.expand_path
       local_path = toml_path.relative_path_from(Pathname.new(File.join(__dir__, '..')))
 
+      if tests_dir == File.join(__dir__, '../toml-test/tests')
+        path_in_list = local_path.relative_path_from(toml_test_list_base)
+        next unless toml_test_list.include?(path_in_list.to_path)
+      end
+
       it "raises an error on parsing #{local_path}" do
-        _{ Tomlrb.load_file(toml_path.to_path) }.must_raise Tomlrb::ParseError, RangeError, ArgumentError
+        _{ Tomlrb.load_file(toml_path.to_path) }.must_raise Tomlrb::ParseError, RangeError, ArgumentError, IndexError, TypeError
       end
     end
   end
@@ -119,7 +138,7 @@ def process_json_leaf(node)
 def process_json(node)
   case node
   when Hash
-    if node['type']
+    if node.keys == ['type', 'value']
       process_json_leaf(node)
     else
       node.each_with_object({}) {|(key, value), table|
diff --git a/test/test_local_date_time.rb b/test/test_local_date_time.rb
index 4d483ed..c057509 100644
--- a/test/test_local_date_time.rb
+++ b/test/test_local_date_time.rb
@@ -44,6 +44,12 @@ def time_knows_zone_names?
     _(d.to_s).must_equal '1979-05-27'
   end
 
+  it 'raises error for invalid date' do
+    assert_raises ArgumentError do
+      Tomlrb::LocalDate.new('2100', '02', '29')
+    end
+  end
+
   describe '#to_time' do
     subject { Tomlrb::LocalDate.new('1979', '05', '27') }
 
diff --git a/toml-test b/toml-test
index 4634fdf..ddd1933 160000
--- a/toml-test
+++ b/toml-test
@@ -1 +1 @@
-Subproject commit 4634fdf3a6ecd6aaea5f4cdcd98b2733c2694993
+Subproject commit ddd19332f411a03b58ef022b1807ef33df68ae70