diff --git a/lkql/build/railroad-diagrams/bool_pattern.svg b/lkql/build/railroad-diagrams/bool_pattern.svg
new file mode 100644
index 000000000..1667ba041
--- /dev/null
+++ b/lkql/build/railroad-diagrams/bool_pattern.svg
@@ -0,0 +1,40 @@
+<svg class="railroad-diagram" height="92" viewBox="0 0 291.5 92" width="291.5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+	svg.railroad-diagram {
+		background-color:hsl(30,20%,95%);
+	}
+	svg.railroad-diagram path {
+		stroke-width:3;
+		stroke:black;
+		fill:rgba(0,0,0,0);
+	}
+	svg.railroad-diagram text {
+		font:bold 14px monospace;
+		text-anchor:middle;
+	}
+	svg.railroad-diagram text.label{
+		text-anchor:start;
+	}
+	svg.railroad-diagram text.comment{
+		font:italic 12px monospace;
+	}
+	svg.railroad-diagram rect{
+		stroke-width:3;
+		stroke:black;
+		fill:hsl(120,100%,90%);
+	}
+	svg.railroad-diagram rect.group-box {
+		stroke: gray;
+		stroke-dasharray: 10 5;
+		fill: none;
+	}
+
+/* ]]> */
+</style><g>
+<path d="M20 21v20m10 -20v20m-10 -10h112.0"></path><text style="text-anchor:start" x="20" y="16">bool&#95;pattern</text></g><g>
+<path d="M132.0 31h0.0"></path><path d="M251.5 31h0.0"></path><path d="M132.0 31h20"></path><g>
+<path d="M152.0 31h4.25"></path><path d="M227.25 31h4.25"></path><g class="terminal ">
+<path d="M156.25 31h0.0"></path><path d="M227.25 31h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="156.25" y="20"></rect><text x="191.75" y="35">'true'</text></g></g><path d="M231.5 31h20"></path><path d="M132.0 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g>
+<path d="M152.0 61h0.0"></path><path d="M231.5 61h0.0"></path><g class="terminal ">
+<path d="M152.0 61h0.0"></path><path d="M231.5 61h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="152.0" y="50"></rect><text x="191.75" y="65">'false'</text></g></g><path d="M231.5 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path></g><path d="M 251.5 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/integer_pattern.svg b/lkql/build/railroad-diagrams/integer_pattern.svg
new file mode 100644
index 000000000..ac7b0084a
--- /dev/null
+++ b/lkql/build/railroad-diagrams/integer_pattern.svg
@@ -0,0 +1,37 @@
+<svg class="railroad-diagram" height="62" viewBox="0 0 297.0 62" width="297.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+	svg.railroad-diagram {
+		background-color:hsl(30,20%,95%);
+	}
+	svg.railroad-diagram path {
+		stroke-width:3;
+		stroke:black;
+		fill:rgba(0,0,0,0);
+	}
+	svg.railroad-diagram text {
+		font:bold 14px monospace;
+		text-anchor:middle;
+	}
+	svg.railroad-diagram text.label{
+		text-anchor:start;
+	}
+	svg.railroad-diagram text.comment{
+		font:italic 12px monospace;
+	}
+	svg.railroad-diagram rect{
+		stroke-width:3;
+		stroke:black;
+		fill:hsl(120,100%,90%);
+	}
+	svg.railroad-diagram rect.group-box {
+		stroke: gray;
+		stroke-dasharray: 10 5;
+		fill: none;
+	}
+
+/* ]]> */
+</style><g>
+<path d="M20 21v20m10 -20v20m-10 -10h137.5"></path><text style="text-anchor:start" x="20" y="16">integer&#95;pattern</text></g><path d="M157.5 31h10"></path><g>
+<path d="M167.5 31h0.0"></path><path d="M247.0 31h0.0"></path><g class="terminal ">
+<path d="M167.5 31h0.0"></path><path d="M247.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="167.5" y="20"></rect><text x="207.25" y="35">Integer</text></g></g><path d="M247.0 31h10"></path><path d="M 257.0 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/list_pattern.svg b/lkql/build/railroad-diagrams/list_pattern.svg
new file mode 100644
index 000000000..39f416053
--- /dev/null
+++ b/lkql/build/railroad-diagrams/list_pattern.svg
@@ -0,0 +1,43 @@
+<svg class="railroad-diagram" height="122" viewBox="0 0 530.5 122" width="530.5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+	svg.railroad-diagram {
+		background-color:hsl(30,20%,95%);
+	}
+	svg.railroad-diagram path {
+		stroke-width:3;
+		stroke:black;
+		fill:rgba(0,0,0,0);
+	}
+	svg.railroad-diagram text {
+		font:bold 14px monospace;
+		text-anchor:middle;
+	}
+	svg.railroad-diagram text.label{
+		text-anchor:start;
+	}
+	svg.railroad-diagram text.comment{
+		font:italic 12px monospace;
+	}
+	svg.railroad-diagram rect{
+		stroke-width:3;
+		stroke:black;
+		fill:hsl(120,100%,90%);
+	}
+	svg.railroad-diagram rect.group-box {
+		stroke: gray;
+		stroke-dasharray: 10 5;
+		fill: none;
+	}
+
+/* ]]> */
+</style><g>
+<path d="M20 21v20m10 -20v20m-10 -10h112.0"></path><text style="text-anchor:start" x="20" y="16">list&#95;pattern</text></g><path d="M132.0 31h10"></path><g>
+<path d="M142.0 31h0.0"></path><path d="M480.5 31h0.0"></path><g class="terminal ">
+<path d="M142.0 31h0.0"></path><path d="M187.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="142.0" y="20"></rect><text x="164.75" y="35">'&#91;'</text></g><path d="M187.5 31h10"></path><path d="M197.5 31h10"></path><g>
+<path d="M207.5 31h0.0"></path><path d="M415.0 31h0.0"></path><path d="M207.5 31h10"></path><g>
+<path d="M217.5 31h0.0"></path><path d="M405.0 31h0.0"></path><path d="M217.5 31h20"></path><g class="terminal ">
+<path d="M237.5 31h0.0"></path><path d="M385.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="147.5" x="237.5" y="20"></rect><text x="311.25" y="35">binding&#95;pattern</text></g><path d="M385.0 31h20"></path><path d="M217.5 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M237.5 61h8.5"></path><path d="M376.5 61h8.5"></path><rect height="22" rx="10" ry="10" width="130.5" x="246.0" y="50"></rect><text x="311.25" y="65">splat&#95;pattern</text></g><path d="M385.0 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path></g><path d="M405.0 31h10"></path><path d="M217.5 31a10 10 0 0 0 -10 10v40a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M217.5 91h71.0"></path><path d="M334.0 91h71.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="288.5" y="80"></rect><text x="311.25" y="95">','</text></g><path d="M405.0 91a10 10 0 0 0 10 -10v-40a10 10 0 0 0 -10 -10"></path></g><path d="M415.0 31h10"></path><path d="M425.0 31h10"></path><g class="terminal ">
+<path d="M435.0 31h0.0"></path><path d="M480.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="435.0" y="20"></rect><text x="457.75" y="35">'&#93;'</text></g></g><path d="M480.5 31h10"></path><path d="M 490.5 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/object_pattern.svg b/lkql/build/railroad-diagrams/object_pattern.svg
new file mode 100644
index 000000000..20250476b
--- /dev/null
+++ b/lkql/build/railroad-diagrams/object_pattern.svg
@@ -0,0 +1,43 @@
+<svg class="railroad-diagram" height="122" viewBox="0 0 590.0 122" width="590.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+	svg.railroad-diagram {
+		background-color:hsl(30,20%,95%);
+	}
+	svg.railroad-diagram path {
+		stroke-width:3;
+		stroke:black;
+		fill:rgba(0,0,0,0);
+	}
+	svg.railroad-diagram text {
+		font:bold 14px monospace;
+		text-anchor:middle;
+	}
+	svg.railroad-diagram text.label{
+		text-anchor:start;
+	}
+	svg.railroad-diagram text.comment{
+		font:italic 12px monospace;
+	}
+	svg.railroad-diagram rect{
+		stroke-width:3;
+		stroke:black;
+		fill:hsl(120,100%,90%);
+	}
+	svg.railroad-diagram rect.group-box {
+		stroke: gray;
+		stroke-dasharray: 10 5;
+		fill: none;
+	}
+
+/* ]]> */
+</style><g>
+<path d="M20 21v20m10 -20v20m-10 -10h129.0"></path><text style="text-anchor:start" x="20" y="16">object&#95;pattern</text></g><path d="M149.0 31h10"></path><g>
+<path d="M159.0 31h0.0"></path><path d="M540.0 31h0.0"></path><g class="terminal ">
+<path d="M159.0 31h0.0"></path><path d="M204.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="159.0" y="20"></rect><text x="181.75" y="35">'{'</text></g><path d="M204.5 31h10"></path><path d="M214.5 31h10"></path><g>
+<path d="M224.5 31h0.0"></path><path d="M474.5 31h0.0"></path><path d="M224.5 31h10"></path><g>
+<path d="M234.5 31h0.0"></path><path d="M464.5 31h0.0"></path><path d="M234.5 31h20"></path><g class="terminal ">
+<path d="M254.5 31h0.0"></path><path d="M444.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="190.0" x="254.5" y="20"></rect><text x="349.5" y="35">object&#95;pattern&#95;assoc</text></g><path d="M444.5 31h20"></path><path d="M234.5 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M254.5 61h29.75"></path><path d="M414.75 61h29.75"></path><rect height="22" rx="10" ry="10" width="130.5" x="284.25" y="50"></rect><text x="349.5" y="65">splat&#95;pattern</text></g><path d="M444.5 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path></g><path d="M464.5 31h10"></path><path d="M234.5 31a10 10 0 0 0 -10 10v40a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M234.5 91h92.25"></path><path d="M372.25 91h92.25"></path><rect height="22" rx="10" ry="10" width="45.5" x="326.75" y="80"></rect><text x="349.5" y="95">','</text></g><path d="M464.5 91a10 10 0 0 0 10 -10v-40a10 10 0 0 0 -10 -10"></path></g><path d="M474.5 31h10"></path><path d="M484.5 31h10"></path><g class="terminal ">
+<path d="M494.5 31h0.0"></path><path d="M540.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="494.5" y="20"></rect><text x="517.25" y="35">'}'</text></g></g><path d="M540.0 31h10"></path><path d="M 550.0 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/object_pattern_assoc.svg b/lkql/build/railroad-diagrams/object_pattern_assoc.svg
new file mode 100644
index 000000000..18b45e477
--- /dev/null
+++ b/lkql/build/railroad-diagrams/object_pattern_assoc.svg
@@ -0,0 +1,39 @@
+<svg class="railroad-diagram" height="62" viewBox="0 0 462.0 62" width="462.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+	svg.railroad-diagram {
+		background-color:hsl(30,20%,95%);
+	}
+	svg.railroad-diagram path {
+		stroke-width:3;
+		stroke:black;
+		fill:rgba(0,0,0,0);
+	}
+	svg.railroad-diagram text {
+		font:bold 14px monospace;
+		text-anchor:middle;
+	}
+	svg.railroad-diagram text.label{
+		text-anchor:start;
+	}
+	svg.railroad-diagram text.comment{
+		font:italic 12px monospace;
+	}
+	svg.railroad-diagram rect{
+		stroke-width:3;
+		stroke:black;
+		fill:hsl(120,100%,90%);
+	}
+	svg.railroad-diagram rect.group-box {
+		stroke: gray;
+		stroke-dasharray: 10 5;
+		fill: none;
+	}
+
+/* ]]> */
+</style><g>
+<path d="M20 21v20m10 -20v20m-10 -10h180.0"></path><text style="text-anchor:start" x="20" y="16">object&#95;pattern&#95;assoc</text></g><path d="M200.0 31h10"></path><g>
+<path d="M210.0 31h0.0"></path><path d="M412.0 31h0.0"></path><g class="terminal ">
+<path d="M210.0 31h0.0"></path><path d="M247.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="210.0" y="20"></rect><text x="228.5" y="35">id</text></g><path d="M247.0 31h10"></path><path d="M257.0 31h10"></path><g class="terminal ">
+<path d="M267.0 31h0.0"></path><path d="M312.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="267.0" y="20"></rect><text x="289.75" y="35">':'</text></g><path d="M312.5 31h10"></path><path d="M322.5 31h10"></path><g class="terminal ">
+<path d="M332.5 31h0.0"></path><path d="M412.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="332.5" y="20"></rect><text x="372.25" y="35">pattern</text></g></g><path d="M412.0 31h10"></path><path d="M 422.0 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/pattern.svg b/lkql/build/railroad-diagrams/pattern.svg
index 31a54aff1..84651c033 100644
--- a/lkql/build/railroad-diagrams/pattern.svg
+++ b/lkql/build/railroad-diagrams/pattern.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="92" viewBox="0 0 533.0 92" width="533.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg class="railroad-diagram" height="92" viewBox="0 0 499.0 92" width="499.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g transform="translate(.5 .5)">
 <style>/* <![CDATA[ */
 	svg.railroad-diagram {
@@ -33,9 +33,9 @@
 /* ]]> */
 </style><g>
 <path d="M20 21v20m10 -20v20m-10 -10h69.5"></path><text style="text-anchor:start" x="20" y="16">pattern</text></g><g>
-<path d="M89.5 31h0.0"></path><path d="M493.0 31h0.0"></path><path d="M89.5 31h20"></path><g>
-<path d="M109.5 31h0.0"></path><path d="M473.0 31h0.0"></path><g class="terminal ">
-<path d="M109.5 31h0.0"></path><path d="M299.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="190.0" x="109.5" y="20"></rect><text x="204.5" y="35">chained&#95;node&#95;pattern</text></g><path d="M299.5 31h10"></path><path d="M309.5 31h10"></path><g class="terminal ">
-<path d="M319.5 31h0.0"></path><path d="M373.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="319.5" y="20"></rect><text x="346.5" y="35">'or'</text></g><path d="M373.5 31h10"></path><path d="M383.5 31h10"></path><g class="terminal ">
-<path d="M393.5 31h0.0"></path><path d="M473.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="393.5" y="20"></rect><text x="433.25" y="35">pattern</text></g></g><path d="M473.0 31h20"></path><path d="M89.5 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g class="terminal ">
-<path d="M109.5 61h86.75"></path><path d="M386.25 61h86.75"></path><rect height="22" rx="10" ry="10" width="190.0" x="196.25" y="50"></rect><text x="291.25" y="65">chained&#95;node&#95;pattern</text></g><path d="M473.0 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path></g><path d="M 493.0 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
+<path d="M89.5 31h0.0"></path><path d="M459.0 31h0.0"></path><path d="M89.5 31h20"></path><g>
+<path d="M109.5 31h0.0"></path><path d="M439.0 31h0.0"></path><g class="terminal ">
+<path d="M109.5 31h0.0"></path><path d="M265.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="156.0" x="109.5" y="20"></rect><text x="187.5" y="35">filtered&#95;pattern</text></g><path d="M265.5 31h10"></path><path d="M275.5 31h10"></path><g class="terminal ">
+<path d="M285.5 31h0.0"></path><path d="M339.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="285.5" y="20"></rect><text x="312.5" y="35">'or'</text></g><path d="M339.5 31h10"></path><path d="M349.5 31h10"></path><g class="terminal ">
+<path d="M359.5 31h0.0"></path><path d="M439.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="359.5" y="20"></rect><text x="399.25" y="35">pattern</text></g></g><path d="M439.0 31h20"></path><path d="M89.5 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M109.5 61h86.75"></path><path d="M352.25 61h86.75"></path><rect height="22" rx="10" ry="10" width="156.0" x="196.25" y="50"></rect><text x="274.25" y="65">filtered&#95;pattern</text></g><path d="M439.0 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path></g><path d="M 459.0 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/pattern_arg.svg b/lkql/build/railroad-diagrams/pattern_arg.svg
index 0f8921a38..8d0c4cd92 100644
--- a/lkql/build/railroad-diagrams/pattern_arg.svg
+++ b/lkql/build/railroad-diagrams/pattern_arg.svg
@@ -38,11 +38,11 @@
 <path d="M143.5 31h0.0"></path><path d="M274.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="130.5" x="143.5" y="20"></rect><text x="208.75" y="35">selector&#95;call</text></g><path d="M274.0 31h10"></path><path d="M284.0 31h10"></path><g class="terminal ">
 <path d="M294.0 31h0.0"></path><path d="M348.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="294.0" y="20"></rect><text x="321.0" y="35">'is'</text></g><path d="M348.0 31h10"></path><path d="M358.0 31h10"></path><g class="terminal ">
 <path d="M368.0 31h0.0"></path><path d="M447.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="368.0" y="20"></rect><text x="407.75" y="35">pattern</text></g></g><path d="M447.5 31h20"></path><path d="M123.5 31a10 10 0 0 1 10 10v10a10 10 0 0 0 10 10"></path><g>
-<path d="M143.5 61h25.5"></path><path d="M422.0 61h25.5"></path><g class="terminal ">
-<path d="M169.0 61h0.0"></path><path d="M206.0 61h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="169.0" y="50"></rect><text x="187.5" y="65">id</text></g><path d="M206.0 61h10"></path><path d="M216.0 61h10"></path><g class="terminal ">
-<path d="M226.0 61h0.0"></path><path d="M280.0 61h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="226.0" y="50"></rect><text x="253.0" y="65">'is'</text></g><path d="M280.0 61h10"></path><path d="M290.0 61h10"></path><g class="terminal ">
-<path d="M300.0 61h0.0"></path><path d="M422.0 61h0.0"></path><rect height="22" rx="10" ry="10" width="122.0" x="300.0" y="50"></rect><text x="361.0" y="65">detail&#95;value</text></g></g><path d="M447.5 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path><path d="M123.5 31a10 10 0 0 1 10 10v40a10 10 0 0 0 10 10"></path><g>
-<path d="M143.5 91h0.0"></path><path d="M447.5 91h0.0"></path><g class="terminal ">
-<path d="M143.5 91h0.0"></path><path d="M231.5 91h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="143.5" y="80"></rect><text x="187.5" y="95">fun&#95;call</text></g><path d="M231.5 91h10"></path><path d="M241.5 91h10"></path><g class="terminal ">
-<path d="M251.5 91h0.0"></path><path d="M305.5 91h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="251.5" y="80"></rect><text x="278.5" y="95">'is'</text></g><path d="M305.5 91h10"></path><path d="M315.5 91h10"></path><g class="terminal ">
-<path d="M325.5 91h0.0"></path><path d="M447.5 91h0.0"></path><rect height="22" rx="10" ry="10" width="122.0" x="325.5" y="80"></rect><text x="386.5" y="95">detail&#95;value</text></g></g><path d="M447.5 91a10 10 0 0 0 10 -10v-40a10 10 0 0 1 10 -10"></path></g><path d="M 467.5 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
+<path d="M143.5 61h46.75"></path><path d="M400.75 61h46.75"></path><g class="terminal ">
+<path d="M190.25 61h0.0"></path><path d="M227.25 61h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="190.25" y="50"></rect><text x="208.75" y="65">id</text></g><path d="M227.25 61h10"></path><path d="M237.25 61h10"></path><g class="terminal ">
+<path d="M247.25 61h0.0"></path><path d="M301.25 61h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="247.25" y="50"></rect><text x="274.25" y="65">'is'</text></g><path d="M301.25 61h10"></path><path d="M311.25 61h10"></path><g class="terminal ">
+<path d="M321.25 61h0.0"></path><path d="M400.75 61h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="321.25" y="50"></rect><text x="361.0" y="65">pattern</text></g></g><path d="M447.5 61a10 10 0 0 0 10 -10v-10a10 10 0 0 1 10 -10"></path><path d="M123.5 31a10 10 0 0 1 10 10v40a10 10 0 0 0 10 10"></path><g>
+<path d="M143.5 91h21.25"></path><path d="M426.25 91h21.25"></path><g class="terminal ">
+<path d="M164.75 91h0.0"></path><path d="M252.75 91h0.0"></path><rect height="22" rx="10" ry="10" width="88.0" x="164.75" y="80"></rect><text x="208.75" y="95">fun&#95;call</text></g><path d="M252.75 91h10"></path><path d="M262.75 91h10"></path><g class="terminal ">
+<path d="M272.75 91h0.0"></path><path d="M326.75 91h0.0"></path><rect height="22" rx="10" ry="10" width="54.0" x="272.75" y="80"></rect><text x="299.75" y="95">'is'</text></g><path d="M326.75 91h10"></path><path d="M336.75 91h10"></path><g class="terminal ">
+<path d="M346.75 91h0.0"></path><path d="M426.25 91h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="346.75" y="80"></rect><text x="386.5" y="95">pattern</text></g></g><path d="M447.5 91a10 10 0 0 0 10 -10v-40a10 10 0 0 1 10 -10"></path></g><path d="M 467.5 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/regex_pattern.svg b/lkql/build/railroad-diagrams/regex_pattern.svg
new file mode 100644
index 000000000..badab289a
--- /dev/null
+++ b/lkql/build/railroad-diagrams/regex_pattern.svg
@@ -0,0 +1,37 @@
+<svg class="railroad-diagram" height="62" viewBox="0 0 271.5 62" width="271.5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+	svg.railroad-diagram {
+		background-color:hsl(30,20%,95%);
+	}
+	svg.railroad-diagram path {
+		stroke-width:3;
+		stroke:black;
+		fill:rgba(0,0,0,0);
+	}
+	svg.railroad-diagram text {
+		font:bold 14px monospace;
+		text-anchor:middle;
+	}
+	svg.railroad-diagram text.label{
+		text-anchor:start;
+	}
+	svg.railroad-diagram text.comment{
+		font:italic 12px monospace;
+	}
+	svg.railroad-diagram rect{
+		stroke-width:3;
+		stroke:black;
+		fill:hsl(120,100%,90%);
+	}
+	svg.railroad-diagram rect.group-box {
+		stroke: gray;
+		stroke-dasharray: 10 5;
+		fill: none;
+	}
+
+/* ]]> */
+</style><g>
+<path d="M20 21v20m10 -20v20m-10 -10h120.5"></path><text style="text-anchor:start" x="20" y="16">regex&#95;pattern</text></g><path d="M140.5 31h10"></path><g>
+<path d="M150.5 31h0.0"></path><path d="M221.5 31h0.0"></path><g class="terminal ">
+<path d="M150.5 31h0.0"></path><path d="M221.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="150.5" y="20"></rect><text x="186.0" y="35">String</text></g></g><path d="M221.5 31h10"></path><path d="M 231.5 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/splat_pattern.svg b/lkql/build/railroad-diagrams/splat_pattern.svg
new file mode 100644
index 000000000..10e8bb04e
--- /dev/null
+++ b/lkql/build/railroad-diagrams/splat_pattern.svg
@@ -0,0 +1,42 @@
+<svg class="railroad-diagram" height="71" viewBox="0 0 415.5 71" width="415.5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+	svg.railroad-diagram {
+		background-color:hsl(30,20%,95%);
+	}
+	svg.railroad-diagram path {
+		stroke-width:3;
+		stroke:black;
+		fill:rgba(0,0,0,0);
+	}
+	svg.railroad-diagram text {
+		font:bold 14px monospace;
+		text-anchor:middle;
+	}
+	svg.railroad-diagram text.label{
+		text-anchor:start;
+	}
+	svg.railroad-diagram text.comment{
+		font:italic 12px monospace;
+	}
+	svg.railroad-diagram rect{
+		stroke-width:3;
+		stroke:black;
+		fill:hsl(120,100%,90%);
+	}
+	svg.railroad-diagram rect.group-box {
+		stroke: gray;
+		stroke-dasharray: 10 5;
+		fill: none;
+	}
+
+/* ]]> */
+</style><g>
+<path d="M20 30v20m10 -20v20m-10 -10h120.5"></path><text style="text-anchor:start" x="20" y="25">splat&#95;pattern</text></g><path d="M140.5 40h10"></path><g>
+<path d="M150.5 40h0.0"></path><path d="M365.5 40h0.0"></path><g>
+<path d="M150.5 40h0.0"></path><path d="M293.0 40h0.0"></path><path d="M150.5 40a10 10 0 0 0 10 -10v0a10 10 0 0 1 10 -10"></path><g>
+<path d="M170.5 20h102.5"></path></g><path d="M273.0 20a10 10 0 0 1 10 10v0a10 10 0 0 0 10 10"></path><path d="M150.5 40h20"></path><g>
+<path d="M170.5 40h0.0"></path><path d="M273.0 40h0.0"></path><g class="terminal ">
+<path d="M170.5 40h0.0"></path><path d="M207.5 40h0.0"></path><rect height="22" rx="10" ry="10" width="37.0" x="170.5" y="29"></rect><text x="189.0" y="44">id</text></g><path d="M207.5 40h10"></path><path d="M217.5 40h10"></path><g class="terminal ">
+<path d="M227.5 40h0.0"></path><path d="M273.0 40h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="227.5" y="29"></rect><text x="250.25" y="44">'@'</text></g></g><path d="M273.0 40h20"></path></g><path d="M293.0 40h10"></path><g class="terminal ">
+<path d="M303.0 40h0.0"></path><path d="M365.5 40h0.0"></path><rect height="22" rx="10" ry="10" width="62.5" x="303.0" y="29"></rect><text x="334.25" y="44">'...'</text></g></g><path d="M365.5 40h10"></path><path d="M 375.5 40 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/tuple_pattern.svg b/lkql/build/railroad-diagrams/tuple_pattern.svg
new file mode 100644
index 000000000..5a5183f9f
--- /dev/null
+++ b/lkql/build/railroad-diagrams/tuple_pattern.svg
@@ -0,0 +1,41 @@
+<svg class="railroad-diagram" height="92" viewBox="0 0 499.0 92" width="499.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g transform="translate(.5 .5)">
+<style>/* <![CDATA[ */
+	svg.railroad-diagram {
+		background-color:hsl(30,20%,95%);
+	}
+	svg.railroad-diagram path {
+		stroke-width:3;
+		stroke:black;
+		fill:rgba(0,0,0,0);
+	}
+	svg.railroad-diagram text {
+		font:bold 14px monospace;
+		text-anchor:middle;
+	}
+	svg.railroad-diagram text.label{
+		text-anchor:start;
+	}
+	svg.railroad-diagram text.comment{
+		font:italic 12px monospace;
+	}
+	svg.railroad-diagram rect{
+		stroke-width:3;
+		stroke:black;
+		fill:hsl(120,100%,90%);
+	}
+	svg.railroad-diagram rect.group-box {
+		stroke: gray;
+		stroke-dasharray: 10 5;
+		fill: none;
+	}
+
+/* ]]> */
+</style><g>
+<path d="M20 21v20m10 -20v20m-10 -10h120.5"></path><text style="text-anchor:start" x="20" y="16">tuple&#95;pattern</text></g><path d="M140.5 31h10"></path><g>
+<path d="M150.5 31h0.0"></path><path d="M449.0 31h0.0"></path><g class="terminal ">
+<path d="M150.5 31h0.0"></path><path d="M196.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="150.5" y="20"></rect><text x="173.25" y="35">'('</text></g><path d="M196.0 31h10"></path><path d="M206.0 31h10"></path><g>
+<path d="M216.0 31h0.0"></path><path d="M383.5 31h0.0"></path><path d="M216.0 31h10"></path><g class="terminal ">
+<path d="M226.0 31h0.0"></path><path d="M373.5 31h0.0"></path><rect height="22" rx="10" ry="10" width="147.5" x="226.0" y="20"></rect><text x="299.75" y="35">binding&#95;pattern</text></g><path d="M373.5 31h10"></path><path d="M226.0 31a10 10 0 0 0 -10 10v10a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M226.0 61h51.0"></path><path d="M322.5 61h51.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="277.0" y="50"></rect><text x="299.75" y="65">','</text></g><path d="M373.5 61a10 10 0 0 0 10 -10v-10a10 10 0 0 0 -10 -10"></path></g><path d="M383.5 31h10"></path><path d="M393.5 31h10"></path><g class="terminal ">
+<path d="M403.5 31h0.0"></path><path d="M449.0 31h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="403.5" y="20"></rect><text x="426.25" y="35">')'</text></g></g><path d="M449.0 31h10"></path><path d="M 459.0 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/build/railroad-diagrams/value_pattern.svg b/lkql/build/railroad-diagrams/value_pattern.svg
index 12ea894a2..db8a1ff27 100644
--- a/lkql/build/railroad-diagrams/value_pattern.svg
+++ b/lkql/build/railroad-diagrams/value_pattern.svg
@@ -1,4 +1,4 @@
-<svg class="railroad-diagram" height="302" viewBox="0 0 745.5 302" width="745.5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg class="railroad-diagram" height="452" viewBox="0 0 745.5 452" width="745.5" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g transform="translate(.5 .5)">
 <style>/* <![CDATA[ */
 	svg.railroad-diagram {
@@ -55,13 +55,17 @@
 <path d="M160.5 151h239.75"></path><path d="M445.75 151h239.75"></path><g class="terminal ">
 <path d="M400.25 151h0.0"></path><path d="M445.75 151h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="400.25" y="140"></rect><text x="423.0" y="155">'&#42;'</text></g></g><path d="M685.5 151a10 10 0 0 0 10 -10v-100a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v130a10 10 0 0 0 10 10"></path><g>
 <path d="M160.5 181h227.0"></path><path d="M458.5 181h227.0"></path><g class="terminal ">
-<path d="M387.5 181h0.0"></path><path d="M458.5 181h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="387.5" y="170"></rect><text x="423.0" y="185">'null'</text></g></g><path d="M685.5 181a10 10 0 0 0 10 -10v-130a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v160a10 10 0 0 0 10 10"></path><g>
-<path d="M160.5 211h227.0"></path><path d="M458.5 211h227.0"></path><g class="terminal ">
-<path d="M387.5 211h0.0"></path><path d="M458.5 211h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="387.5" y="200"></rect><text x="423.0" y="215">String</text></g></g><path d="M685.5 211a10 10 0 0 0 10 -10v-160a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v190a10 10 0 0 0 10 10"></path><g>
+<path d="M387.5 181h0.0"></path><path d="M458.5 181h0.0"></path><rect height="22" rx="10" ry="10" width="71.0" x="387.5" y="170"></rect><text x="423.0" y="185">'null'</text></g></g><path d="M685.5 181a10 10 0 0 0 10 -10v-130a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v160a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M160.5 211h197.25"></path><path d="M488.25 211h197.25"></path><rect height="22" rx="10" ry="10" width="130.5" x="357.75" y="200"></rect><text x="423.0" y="215">regex&#95;pattern</text></g><path d="M685.5 211a10 10 0 0 0 10 -10v-160a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v190a10 10 0 0 0 10 10"></path><g>
 <path d="M160.5 241h156.0"></path><path d="M529.5 241h156.0"></path><g class="terminal ">
 <path d="M316.5 241h0.0"></path><path d="M379.0 241h0.0"></path><rect height="22" rx="10" ry="10" width="62.5" x="316.5" y="230"></rect><text x="347.75" y="245">'not'</text></g><path d="M379.0 241h10"></path><path d="M389.0 241h10"></path><g class="terminal ">
-<path d="M399.0 241h0.0"></path><path d="M529.5 241h0.0"></path><rect height="22" rx="10" ry="10" width="130.5" x="399.0" y="230"></rect><text x="464.25" y="245">value&#95;pattern</text></g></g><path d="M685.5 241a10 10 0 0 0 10 -10v-190a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v220a10 10 0 0 0 10 10"></path><g>
-<path d="M160.5 271h157.25"></path><path d="M528.25 271h157.25"></path><g class="terminal ">
-<path d="M317.75 271h0.0"></path><path d="M363.25 271h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="317.75" y="260"></rect><text x="340.5" y="275">'('</text></g><path d="M363.25 271h10"></path><path d="M373.25 271h10"></path><g class="terminal ">
-<path d="M383.25 271h0.0"></path><path d="M462.75 271h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="383.25" y="260"></rect><text x="423.0" y="275">pattern</text></g><path d="M462.75 271h10"></path><path d="M472.75 271h10"></path><g class="terminal ">
-<path d="M482.75 271h0.0"></path><path d="M528.25 271h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="482.75" y="260"></rect><text x="505.5" y="275">')'</text></g></g><path d="M685.5 271a10 10 0 0 0 10 -10v-220a10 10 0 0 1 10 -10"></path></g><path d="M 705.5 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
+<path d="M399.0 241h0.0"></path><path d="M529.5 241h0.0"></path><rect height="22" rx="10" ry="10" width="130.5" x="399.0" y="230"></rect><text x="464.25" y="245">value&#95;pattern</text></g></g><path d="M685.5 241a10 10 0 0 0 10 -10v-190a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v220a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M160.5 271h201.5"></path><path d="M484.0 271h201.5"></path><rect height="22" rx="10" ry="10" width="122.0" x="362.0" y="260"></rect><text x="423.0" y="275">bool&#95;pattern</text></g><path d="M685.5 271a10 10 0 0 0 10 -10v-220a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v250a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M160.5 301h188.75"></path><path d="M496.75 301h188.75"></path><rect height="22" rx="10" ry="10" width="147.5" x="349.25" y="290"></rect><text x="423.0" y="305">integer&#95;pattern</text></g><path d="M685.5 301a10 10 0 0 0 10 -10v-250a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v280a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M160.5 331h201.5"></path><path d="M484.0 331h201.5"></path><rect height="22" rx="10" ry="10" width="122.0" x="362.0" y="320"></rect><text x="423.0" y="335">list&#95;pattern</text></g><path d="M685.5 331a10 10 0 0 0 10 -10v-280a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v310a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M160.5 361h193.0"></path><path d="M492.5 361h193.0"></path><rect height="22" rx="10" ry="10" width="139.0" x="353.5" y="350"></rect><text x="423.0" y="365">object&#95;pattern</text></g><path d="M685.5 361a10 10 0 0 0 10 -10v-310a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v340a10 10 0 0 0 10 10"></path><g>
+<path d="M160.5 391h157.25"></path><path d="M528.25 391h157.25"></path><g class="terminal ">
+<path d="M317.75 391h0.0"></path><path d="M363.25 391h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="317.75" y="380"></rect><text x="340.5" y="395">'('</text></g><path d="M363.25 391h10"></path><path d="M373.25 391h10"></path><g class="terminal ">
+<path d="M383.25 391h0.0"></path><path d="M462.75 391h0.0"></path><rect height="22" rx="10" ry="10" width="79.5" x="383.25" y="380"></rect><text x="423.0" y="395">pattern</text></g><path d="M462.75 391h10"></path><path d="M472.75 391h10"></path><g class="terminal ">
+<path d="M482.75 391h0.0"></path><path d="M528.25 391h0.0"></path><rect height="22" rx="10" ry="10" width="45.5" x="482.75" y="380"></rect><text x="505.5" y="395">')'</text></g></g><path d="M685.5 391a10 10 0 0 0 10 -10v-340a10 10 0 0 1 10 -10"></path><path d="M140.5 31a10 10 0 0 1 10 10v370a10 10 0 0 0 10 10"></path><g class="terminal ">
+<path d="M160.5 421h197.25"></path><path d="M488.25 421h197.25"></path><rect height="22" rx="10" ry="10" width="130.5" x="357.75" y="410"></rect><text x="423.0" y="425">tuple&#95;pattern</text></g><path d="M685.5 421a10 10 0 0 0 10 -10v-370a10 10 0 0 1 10 -10"></path></g><path d="M 705.5 31 h 20 m -10 -10 v 20 m 10 -20 v 20"></path></g></svg>
\ No newline at end of file
diff --git a/lkql/language/lexer.py b/lkql/language/lexer.py
index 8ab2f19c1..17c43cdb6 100644
--- a/lkql/language/lexer.py
+++ b/lkql/language/lexer.py
@@ -33,6 +33,7 @@ class Token(LexerToken):
     Import = WithSymbol()
 
     Dot = WithText()
+    DotDotDot = WithText()
     QuestionDot = WithText()
     QuestionBrack = WithText()
     Question = WithText()
@@ -76,6 +77,7 @@ class Token(LexerToken):
 lkql_lexer.add_rules(
     (Pattern(r"[ \t\n\r]"),                       Token.Whitespace),
     (Literal("."),                                Token.Dot),
+    (Literal("..."),                              Token.DotDotDot),
     (Literal("?."),                               Token.QuestionDot),
     (Literal("?["),                               Token.QuestionBrack),
     (Literal("?"),                                Token.Question),
diff --git a/lkql/language/parser.py b/lkql/language/parser.py
index 8d3ae8658..119b043ab 100644
--- a/lkql/language/parser.py
+++ b/lkql/language/parser.py
@@ -15,7 +15,6 @@
 
 
 @abstract
-@has_abstract_list
 class LkqlNode(ASTNode):
     """
     Root node class for LKQL AST nodes.
@@ -380,36 +379,6 @@ class BasePattern(LkqlNode):
     """
     Root node class for patterns.
     """
-
-    @langkit_property(return_type=T.Identifier, public=True,
-                      kind=AbstractKind.abstract)
-    def binding_name():
-        """
-        Return the pattern's binding name.
-        Return an empty String if the pattern doesn't contain a binding name.
-        """
-        pass
-
-    @langkit_property(return_type=T.Bool, public=True)
-    def has_binding():
-        """
-        Return whether the node pattern contains a binding name.
-        """
-        return dsl_expr.Not(Self.binding_name.is_null)
-
-    @langkit_property(return_type=T.ValuePattern, public=True)
-    def value_part():
-        """
-        Return the value pattern contained in the pattern , if any.
-        """
-        return No(ValuePattern)
-
-
-@abstract
-class UnfilteredPattern(BasePattern):
-    """
-    Pattern without a filtering predicate.
-    """
     pass
 
 
@@ -422,51 +391,32 @@ class FilteredPattern(BasePattern):
 
        o@ObjectDecl when o.children.length == 3
     """
-    pattern = Field(type=UnfilteredPattern)
+    pattern = Field(type=BasePattern)
     predicate = Field(type=Expr)
 
-    @langkit_property()
-    def binding_name():
-        return Self.pattern.binding_name
-
-    @langkit_property()
-    def value_part():
-        return Self.pattern.value_part()
-
 
 @abstract
-class ValuePattern(UnfilteredPattern):
+class ValuePattern(BasePattern):
     """
     Root node class for patterns that filter values.
     (As opposed to patterns that only bind values to a given name without
     doing any kind of filtering)
     """
-
-    @langkit_property()
-    def binding_name():
-        return dsl_expr.No(T.Identifier)
-
-    @langkit_property()
-    def value_part():
-        return Self
+    pass
 
 
-class BindingPattern(UnfilteredPattern):
+class BindingPattern(BasePattern):
     """
     Pattern comprising a binding name and a value pattern.
 
     For instance::
 
-       o : ObjectDecl
+       o@ObjectDecl
     """
 
     binding = Field(type=Identifier)
     value_pattern = Field(type=ValuePattern)
 
-    @langkit_property()
-    def binding_name():
-        return Self.binding
-
 
 class IsClause(Expr):
     """
@@ -502,6 +452,58 @@ class RegexPattern(ValuePattern):
     token_node = True
 
 
+class BoolPattern(ValuePattern):
+    """
+    Pattern to match on booleans.
+    """
+    enum_node = True
+    alternatives = ['true', 'false']
+
+
+class IntegerPattern(ValuePattern):
+    """
+    Pattern to match on integers.
+    """
+    token_node = True
+
+
+class TuplePattern(ValuePattern):
+    """
+    Pattern to match on tuples.
+    """
+    patterns = Field(type=BasePattern.list)
+
+
+class ListPattern(ValuePattern):
+    """
+    Pattern to match on lists.
+    """
+    patterns = Field(type=BasePattern.list)
+
+
+class SplatPattern(ValuePattern):
+    """
+    Pattern to match any remaining number of elements in a list pattern.
+    """
+    binding = Field(type=Identifier)
+
+
+class ObjectPatternAssoc(LkqlNode):
+    """
+    Object pattern assoc in an object pattern:
+    ``label: <pattern>``
+    """
+    name = Field(type=Identifier)
+    pattern = Field(type=BasePattern)
+
+
+class ObjectPattern(ValuePattern):
+    """
+    Pattern to match on objects.
+    """
+    patterns = Field(type=LkqlNode.list)
+
+
 class ParenPattern(ValuePattern):
     """
     A parenthesized pattern.
@@ -953,29 +955,6 @@ class NodeKindPattern(NodePattern):
     kind_name = Field(type=Identifier)
 
 
-@abstract
-class DetailValue(LkqlNode):
-    """
-    Root node class for pattern data values.
-    Pattern data values can be expressions or patterns.
-    """
-    pass
-
-
-class DetailExpr(DetailValue):
-    """
-    Expression pattern data value.
-    """
-    expr_value = Field(type=Expr)
-
-
-class DetailPattern(DetailValue):
-    """
-    Pattern pattern data value
-    """
-    pattern_value = Field(type=BasePattern)
-
-
 @abstract
 class NodePatternDetail(LkqlNode):
     """
@@ -989,7 +968,7 @@ class NodePatternField(NodePatternDetail):
     Access to a field in a node pattern.
     """
     identifier = Field(type=Identifier)
-    expected_value = Field(type=DetailValue)
+    expected_value = Field(type=BasePattern)
 
 
 class NodePatternProperty(NodePatternDetail):
@@ -997,7 +976,7 @@ class NodePatternProperty(NodePatternDetail):
     Access to a property in a node pattern.
     """
     call = Field(type=FunCall)
-    expected_value = Field(type=DetailValue)
+    expected_value = Field(type=BasePattern)
 
 
 class NodePatternSelector(NodePatternDetail):
@@ -1022,52 +1001,6 @@ class ExtendedNodePattern(NodePattern):
     details = Field(type=NodePatternDetail.list)
 
 
-@abstract
-class ChainedPatternLink(LkqlNode):
-    """
-    Element of a chained pattern of the form:
-    ``(selector|field|property) pattern``
-    """
-    pattern = AbstractField(type=BasePattern)
-
-
-class SelectorLink(ChainedPatternLink):
-    """
-    Element of a chained pattern of the form:
-    ``quantifier selector_name pattern``
-    """
-    selector = Field(type=SelectorCall)
-    pattern = Field(type=BasePattern)
-
-
-class FieldLink(ChainedPatternLink):
-    """
-    Element of a chained pattern of the form:
-    ``field pattern``
-    """
-    field = Field(type=Identifier)
-    pattern = Field(type=BasePattern)
-
-
-class PropertyLink(ChainedPatternLink):
-    """
-    Element of a chained pattern of the form:
-    ``property(args) pattern``
-    """
-    property = Field(type=FunCall)
-    pattern = Field(type=BasePattern)
-
-
-class ChainedNodePattern(ValuePattern):
-    """
-    Node pattern of the form::
-
-    ``Kind1(details...) selector1 Kind2(details...) selector2 ... KindN``
-    """
-    first_pattern = Field(type=BasePattern)
-    chain = Field(type=ChainedPatternLink.list)
-
-
 class MatchArm(LkqlNode):
     """
     Represents one case of a 'match'.
@@ -1135,38 +1068,16 @@ class Tuple(Expr):
     import_clause=Import("import", G.id),
 
     query=Query(
-        Opt(
-            "from",
-            Or(G.expr, Unpack("*", G.expr))
-        ),
-        Opt(
-            "through",
-            Or(G.expr)
-        ),
-        "select", c(), Or(
-            QueryKind.alt_first(L.Identifier(match_text="first")),
-            QueryKind.alt_all(),
-        ), G.pattern
+        Opt("from", Or(G.expr, Unpack("*", G.expr))),
+        Opt("through", Or(G.expr)),
+        "select", c(), 
+        Or(QueryKind.alt_first(L.Identifier(match_text="first")),
+           QueryKind.alt_all()), 
+        G.pattern
     ),
 
     pattern=Or(
-        OrPattern(
-            G.chained_node_pattern,
-            "or",
-            G.pattern
-        ),
-        G.chained_node_pattern
-    ),
-
-    chained_node_pattern=Or(
-        ChainedNodePattern(
-            G.filtered_pattern,
-            List(Or(
-                SelectorLink(G.selector_call, "is", G.filtered_pattern),
-                FieldLink(".", G.id, "is", G.filtered_pattern),
-                PropertyLink(".", G.fun_call, "is", G.filtered_pattern)
-            ))
-        ),
+        OrPattern(G.filtered_pattern, "or", G.pattern),
         G.filtered_pattern
     ),
 
@@ -1181,6 +1092,8 @@ class Tuple(Expr):
         G.value_pattern
     ),
 
+    object_pattern_assoc=ObjectPatternAssoc(G.id, ":", G.pattern),
+
     value_pattern=Or(
         ExtendedNodePattern(
 
@@ -1193,19 +1106,43 @@ class Tuple(Expr):
         NodeKindPattern(G.kind_name),
         UniversalPattern("*"),
         NullPattern("null"),
-        RegexPattern(Token.String),
+        G.regex_pattern,
         NotPattern("not", G.value_pattern),
-        ParenPattern("(", G.pattern, ")")
+        G.bool_pattern,
+        G.integer_pattern,
+        G.list_pattern,
+        G.object_pattern,
+        ParenPattern("(", G.pattern, ")"),
+        G.tuple_pattern
     ),
 
+    regex_pattern=RegexPattern(Token.String),
+
+    bool_pattern=Or(
+        BoolPattern.alt_true("true"),
+        BoolPattern.alt_false("false"),
+    ),
+
+    splat_pattern=SplatPattern(Opt(G.id, "@"), "..."),
+
+    integer_pattern=IntegerPattern(Token.Integer),
+    list_pattern=ListPattern(
+        "[",
+        List(G.binding_pattern | G.splat_pattern, sep=","), "]"
+    ),
+    object_pattern=ObjectPattern(
+        "{",
+        List(G.object_pattern_assoc | G.splat_pattern, sep=",", empty_valid=False),
+        "}"
+    ),
+    tuple_pattern=TuplePattern("(", List(G.binding_pattern, sep=","), ")"),
+
     pattern_arg=Or(
         NodePatternSelector(G.selector_call, "is", G.pattern),
-        NodePatternField(G.id, "is", c(), G.detail_value),
-        NodePatternProperty(G.fun_call, "is", c(), G.detail_value)
+        NodePatternField(G.id, "is", c(), G.pattern),
+        NodePatternProperty(G.fun_call, "is", c(), G.pattern)
     ),
 
-    detail_value=Or(DetailPattern(G.pattern), DetailExpr(G.expr)),
-
     selector_call=SelectorCall(
         Identifier(Or(
             Token.Identifier(match_text="any"),
diff --git a/lkql_checker/share/lkql/stdlib.lkql b/lkql_checker/share/lkql/stdlib.lkql
index 5f9e49d1e..7bf4a685f 100644
--- a/lkql_checker/share/lkql/stdlib.lkql
+++ b/lkql_checker/share/lkql/stdlib.lkql
@@ -613,7 +613,7 @@ fun has_non_default_sso(decl) =
 }
 
 selector component_types
-    |" Return all the ``BaseTypeDecl``s corresponding to all fields of a given
+    |" Return all the ``BaseTypeDecl`` corresponding to all fields of a given
     |" type, including their full views, base types and subtypes.
     | TypeDecl(f_type_def is d@RecordTypeDef) =>
         skip *(from d select ComponentDecl)
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLTypeSystem.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLTypeSystem.java
index 5af1aa15c..00f089bda 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLTypeSystem.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/LKQLTypeSystem.java
@@ -145,39 +145,4 @@ public static boolean asBoolean(Object value) {
     public static BigInteger longToBigInteger(long value) {
         return BigInteger.valueOf(value);
     }
-
-    // ----- Node value methods -----
-
-    /**
-     * Check is a value is an ada node.
-     *
-     * @param nodeObject The object to check.
-     * @return True if the object is an ada node, false else.
-     */
-    @TypeCheck(Libadalang.AdaNode.class)
-    public static boolean isAdaNode(Object nodeObject) {
-        return nodeObject instanceof Libadalang.AdaNode || nodeObject instanceof LKQLDepthNode;
-    }
-
-    /**
-     * Cast a generic value to an ada node.
-     *
-     * @param nodeObject The node object.
-     * @return The object cast to an ada node.
-     */
-    @TypeCast(Libadalang.AdaNode.class)
-    public static Libadalang.AdaNode asAdaNode(Object nodeObject) {
-        // If the value is a node
-        if (nodeObject instanceof Libadalang.AdaNode adaNode) {
-            return adaNode;
-        }
-
-        // If the value is a depth node
-        else if (nodeObject instanceof LKQLDepthNode depthNode) {
-            return depthNode.getNode();
-        }
-
-        // Return the default value
-        return LKQLNull.INSTANCE;
-    }
 }
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/MapFunction.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/MapFunction.java
index 29e01873a..9e1d3acc9 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/MapFunction.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/MapFunction.java
@@ -94,7 +94,7 @@ public Object executeGeneric(VirtualFrame frame) {
                         this.callNode.getArgList().getArgs()[1]);
             }
 
-            // Verify the function arrity
+            // Verify the function arity
             if (mapFunction.parameterNames.length != 1) {
                 throw LKQLRuntimeException.fromMessage(
                         "Function passed to map should have arity of one",
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/NodeCheckerFunction.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/NodeCheckerFunction.java
index 67a43ccd9..041786436 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/NodeCheckerFunction.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/NodeCheckerFunction.java
@@ -224,8 +224,6 @@ private void executeCheckers(
                                             currentNode.getUnit(),
                                             currentNode.getSourceLocationRange().start,
                                             e.getLoc().toString(),
-                                            StringUtils.concat(
-                                                    "LANGKIT_SUPPORT.ERRORS.", e.getKind()),
                                             e.getMsg(),
                                             context);
                         }
@@ -238,7 +236,6 @@ private void executeCheckers(
                                         currentNode.getUnit(),
                                         currentNode.getSourceLocationRange().start,
                                         e.getLocationString(),
-                                        "LKQL.ERRORS.STOP_EVALUATION_ERROR",
                                         e.getRawMessage(),
                                         context);
                     }
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/UnitCheckerFunction.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/UnitCheckerFunction.java
index 8226d62a7..e1f8996e0 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/UnitCheckerFunction.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/functions/UnitCheckerFunction.java
@@ -113,7 +113,6 @@ public Object executeGeneric(VirtualFrame frame) {
                                         unit,
                                         Libadalang.SourceLocation.create(1, (short) 1),
                                         e.getLoc().toString(),
-                                        StringUtils.concat("LANGKIT_SUPPORT.ERRORS.", e.getKind()),
                                         e.getMsg(),
                                         context);
                     }
@@ -126,7 +125,6 @@ public Object executeGeneric(VirtualFrame frame) {
                                     unit,
                                     Libadalang.SourceLocation.create(1, (short) 1),
                                     e.getLocationString(),
-                                    "LKQL.ERRORS.STOP_EVALUATION_ERROR",
                                     e.getRawMessage(),
                                     context);
                 }
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/selectors/ReadBuiltInThis.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/selectors/ReadBuiltInThis.java
index 562e2385a..983b29264 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/selectors/ReadBuiltInThis.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/selectors/ReadBuiltInThis.java
@@ -22,6 +22,7 @@
 
 package com.adacore.lkql_jit.built_ins.selectors;
 
+import com.adacore.lkql_jit.built_ins.values.LKQLDepthValue;
 import com.adacore.lkql_jit.nodes.expressions.Expr;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
@@ -45,7 +46,7 @@ public ReadBuiltInThis() {
      */
     @Override
     public Object executeGeneric(VirtualFrame frame) {
-        return frame.getArguments()[1];
+        return ((LKQLDepthValue) frame.getArguments()[1]).value;
     }
 
     // ----- Override methods -----
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLDepthNode.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLDepthValue.java
similarity index 79%
rename from lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLDepthNode.java
rename to lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLDepthValue.java
index dd95351ca..248dccdff 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLDepthNode.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/LKQLDepthValue.java
@@ -22,7 +22,6 @@
 
 package com.adacore.lkql_jit.built_ins.values;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.built_ins.values.bases.BasicLKQLValue;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.dsl.Fallback;
@@ -37,32 +36,22 @@
  * all Libadalang objects will be wrapped in interop LKQL values (#154).
  */
 @ExportLibrary(InteropLibrary.class)
-public final class LKQLDepthNode extends BasicLKQLValue {
+public final class LKQLDepthValue extends BasicLKQLValue {
 
     // ----- Attributes -----
 
     /** The depth of the node. */
-    private final int depth;
+    public final int depth;
 
     /** The decorated node. */
-    private final Libadalang.AdaNode node;
+    public final Object value;
 
     // ----- Constructors -----
 
     /** Create a new depth node. */
-    public LKQLDepthNode(int depth, Libadalang.AdaNode node) {
+    public LKQLDepthValue(int depth, Object value) {
         this.depth = depth;
-        this.node = node;
-    }
-
-    // ----- Getters -----
-
-    public int getDepth() {
-        return depth;
-    }
-
-    public Libadalang.AdaNode getNode() {
-        return node;
+        this.value = value;
     }
 
     // ----- Value methods -----
@@ -72,14 +61,15 @@ public Libadalang.AdaNode getNode() {
     public static class IsIdenticalOrUndefined {
         /** Compare two LKQL depth nodes. */
         @Specialization
-        protected static TriState onNode(final LKQLDepthNode left, final LKQLDepthNode right) {
-            return TriState.valueOf(left.node.equals(right.node));
+        @CompilerDirectives.TruffleBoundary
+        protected static TriState onNode(final LKQLDepthValue left, final LKQLDepthValue right) {
+            return TriState.valueOf(left.value.equals(right.value));
         }
 
         /** Do the comparison with another element. */
         @Fallback
         protected static TriState onOther(
-                @SuppressWarnings("unused") final LKQLDepthNode receiver,
+                @SuppressWarnings("unused") final LKQLDepthValue receiver,
                 @SuppressWarnings("unused") final Object other) {
             return TriState.UNDEFINED;
         }
@@ -88,33 +78,36 @@ protected static TriState onOther(
     /** Return the identity hash code for the given LKQL depth node. */
     @ExportMessage
     @CompilerDirectives.TruffleBoundary
-    public static int identityHashCode(final LKQLDepthNode receiver) {
+    public static int identityHashCode(final LKQLDepthValue receiver) {
         return System.identityHashCode(receiver);
     }
 
     /** Get the displayable string for the interop library. */
     @ExportMessage
+    @CompilerDirectives.TruffleBoundary
     public String toDisplayString(@SuppressWarnings("unused") final boolean allowSideEffects) {
-        return this.node.toString();
+        return this.toString();
     }
 
     // ----- Override methods -----
 
     @Override
+    @CompilerDirectives.TruffleBoundary
     public String toString() {
-        return this.node.toString();
+        return "<DepthVal " + this.value.toString() + ">";
     }
 
     @Override
     @CompilerDirectives.TruffleBoundary
     public int hashCode() {
-        return this.node.hashCode();
+        return this.value.hashCode();
     }
 
     @Override
+    @CompilerDirectives.TruffleBoundary
     public boolean equals(Object o) {
         if (o == this) return true;
-        if (!(o instanceof LKQLDepthNode other)) return false;
-        return this.node.equals(other.node);
+        if (!(o instanceof LKQLDepthValue other)) return false;
+        return this.value.equals(other.value);
     }
 }
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLLazyList.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLLazyList.java
index a0fe64c59..c4dcac1f4 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLLazyList.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLLazyList.java
@@ -53,19 +53,19 @@ protected LKQLLazyList() {
      * Initialize the lazy list cache to the given index. If n < 0 then initialize all the lazy list
      * values.
      */
-    public abstract void initCache(long n);
+    public abstract void computeItemAt(long n);
 
     // ----- List required methods -----
 
     @Override
     public long size() {
-        this.initCache(-1);
+        this.computeItemAt(-1);
         return this.cache.size();
     }
 
     @Override
     public Object get(long i) throws InvalidIndexException {
-        this.initCache(i);
+        this.computeItemAt(i);
         try {
             return this.cache.get((int) i);
         } catch (IndexOutOfBoundsException e) {
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLList.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLList.java
index 880bca395..67ff9e33b 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLList.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLList.java
@@ -29,6 +29,7 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.api.library.ExportLibrary;
 import com.oracle.truffle.api.library.ExportMessage;
+import java.util.Arrays;
 
 /** This class represents an array list in the LKQL language. */
 @ExportLibrary(InteropLibrary.class)
@@ -62,6 +63,14 @@ public Object get(long i) throws InvalidIndexException {
         }
     }
 
+    public Object[] getSlice(long first, long last) throws InvalidIndexException {
+        try {
+            return Arrays.copyOfRange(this.content, (int) first, (int) last);
+        } catch (IndexOutOfBoundsException e) {
+            throw new InvalidIndexException();
+        }
+    }
+
     @Override
     public LKQLIterator iterator() {
         return new LKQLListIterator(this);
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLListComprehension.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLListComprehension.java
index 55d41f86e..d0eae0f68 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLListComprehension.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLListComprehension.java
@@ -80,7 +80,7 @@ public LKQLListComprehension(
     // ----- Lazy list required methods -----
 
     @Override
-    public void initCache(long n) {
+    public void computeItemAt(long n) {
         while (this.pointer < this.argumentsList.length && (this.cache.size() - 1 < n || n < 0)) {
             final Object[] currentArguments = this.argumentsList[this.pointer++];
             System.arraycopy(currentArguments, 0, this.arguments, 1, currentArguments.length);
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLSelectorList.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLSelectorList.java
index 8cf4df625..b40e8b648 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLSelectorList.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/built_ins/values/lists/LKQLSelectorList.java
@@ -24,7 +24,9 @@
 
 import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.LKQLTypeSystemGen;
-import com.adacore.lkql_jit.built_ins.values.LKQLDepthNode;
+import com.adacore.lkql_jit.built_ins.values.LKQLDepthValue;
+import com.adacore.lkql_jit.exception.LKQLRuntimeException;
+import com.adacore.lkql_jit.exception.utils.InvalidIndexException;
 import com.adacore.lkql_jit.nodes.dispatchers.SelectorDispatcher;
 import com.adacore.lkql_jit.nodes.dispatchers.SelectorDispatcherNodeGen;
 import com.adacore.lkql_jit.nodes.root_nodes.SelectorRootNode;
@@ -53,10 +55,10 @@ public class LKQLSelectorList extends LKQLLazyList {
     private final SelectorDispatcher dispatcher;
 
     /** The cache of already explored nodes. */
-    private final HashSet<LKQLDepthNode> alreadyVisited;
+    private final HashSet<LKQLDepthValue> alreadyVisited;
 
     /** The list of the node to recurs on. */
-    private final List<LKQLDepthNode> recursList;
+    private final List<LKQLDepthValue> recursList;
 
     /** The maximal depth for the return. */
     private final int maxDepth;
@@ -65,7 +67,7 @@ public class LKQLSelectorList extends LKQLLazyList {
     private final int minDepth;
 
     /** The precise depth to get from the selector. */
-    private final int depth;
+    private final int exactDepth;
 
     // ----- Constructors -----
 
@@ -94,17 +96,17 @@ public LKQLSelectorList(
         this.recursList = new LinkedList<>();
         this.maxDepth = maxDepth;
         this.minDepth = minDepth;
-        this.depth = depth;
-        this.recursList.add(new LKQLDepthNode(0, adaNode));
+        this.exactDepth = depth;
+        this.recursList.add(new LKQLDepthValue(0, adaNode));
     }
 
     // ----- Lazy list required methods -----
 
     @Override
-    public void initCache(long n) {
+    public void computeItemAt(long n) {
         while (!(this.recursList.size() == 0) && (this.cache.size() - 1 < n || n == -1)) {
             // Get the first recurse item and execute the selector on it
-            LKQLDepthNode nextNode = this.recursList.remove(0);
+            LKQLDepthValue nextNode = this.recursList.remove(0);
             SelectorRootNode.SelectorCallResult result =
                     this.dispatcher.executeDispatch(
                             this.rootNode, this.closure.getContent(), nextNode);
@@ -124,19 +126,21 @@ public void initCache(long n) {
     @CompilerDirectives.TruffleBoundary
     private void addResult(Object toAdd) {
         // If the object is just a node
-        if (toAdd instanceof LKQLDepthNode node) {
+        if (toAdd instanceof LKQLDepthValue node) {
             if (!this.alreadyVisited.contains(node)) {
                 this.addNodeResult(node);
             }
         }
 
         // If the object is an array of node
-        else if (toAdd instanceof LKQLDepthNode[] nodes) {
-            for (LKQLDepthNode node : nodes) {
+        else if (toAdd instanceof LKQLDepthValue[] nodes) {
+            for (LKQLDepthValue node : nodes) {
                 if (!this.alreadyVisited.contains(node)) {
                     this.addNodeResult(node);
                 }
             }
+        } else {
+            throw LKQLRuntimeException.shouldNotHappen("Should not happen");
         }
     }
 
@@ -144,15 +148,15 @@ else if (toAdd instanceof LKQLDepthNode[] nodes) {
     @CompilerDirectives.TruffleBoundary
     private void addRecurs(Object toAdd) {
         // If the object is just a node
-        if (toAdd instanceof LKQLDepthNode node) {
+        if (toAdd instanceof LKQLDepthValue node) {
             if (!this.alreadyVisited.contains(node)) {
                 this.recursList.add(node);
             }
         }
 
         // If the object is an array of node
-        else if (toAdd instanceof LKQLDepthNode[] nodes) {
-            for (LKQLDepthNode node : nodes) {
+        else if (toAdd instanceof LKQLDepthValue[] nodes) {
+            for (LKQLDepthValue node : nodes) {
                 if (!this.alreadyVisited.contains(node)) {
                     this.recursList.add(node);
                 }
@@ -164,7 +168,7 @@ else if (toAdd instanceof LKQLDepthNode[] nodes) {
     @CompilerDirectives.TruffleBoundary
     private void addRecursAndResult(Object toAdd) {
         // If the object is just a node
-        if (toAdd instanceof LKQLDepthNode node) {
+        if (toAdd instanceof LKQLDepthValue node) {
             if (!this.alreadyVisited.contains(node)) {
                 this.addNodeResult(node);
                 this.recursList.add(node);
@@ -172,8 +176,8 @@ private void addRecursAndResult(Object toAdd) {
         }
 
         // If the object is an array of node
-        else if (toAdd instanceof LKQLDepthNode[] nodes) {
-            for (LKQLDepthNode node : nodes) {
+        else if (toAdd instanceof LKQLDepthValue[] nodes) {
+            for (LKQLDepthValue node : nodes) {
                 if (!this.alreadyVisited.contains(node)) {
                     this.addNodeResult(node);
                     this.recursList.add(node);
@@ -184,11 +188,11 @@ else if (toAdd instanceof LKQLDepthNode[] nodes) {
 
     /** Add a node in the result and hashed cache with all verifications. */
     @CompilerDirectives.TruffleBoundary
-    private void addNodeResult(LKQLDepthNode node) {
+    private void addNodeResult(LKQLDepthValue node) {
         // If there is no defined depth
-        if (this.depth < 0) {
-            if ((this.maxDepth < 0 || node.getDepth() <= this.maxDepth)
-                    && (this.minDepth < 0 || node.getDepth() >= this.minDepth)) {
+        if (this.exactDepth < 0) {
+            if ((this.maxDepth < 0 || node.depth <= this.maxDepth)
+                    && (this.minDepth < 0 || node.depth >= this.minDepth)) {
                 this.cache.add(node);
                 this.alreadyVisited.add(node);
             }
@@ -196,13 +200,24 @@ private void addNodeResult(LKQLDepthNode node) {
 
         // Else, only get the wanted nodes
         else {
-            if (node.getDepth() == this.depth) {
+            if (node.depth == this.exactDepth) {
                 this.cache.add(node);
                 this.alreadyVisited.add(node);
             }
         }
     }
 
+    @Override
+    public Object get(long i) throws InvalidIndexException {
+        this.computeItemAt(i);
+        try {
+            var cache = this.cache.get((int) i);
+            return ((LKQLDepthValue) cache).value;
+        } catch (IndexOutOfBoundsException e) {
+            throw new InvalidIndexException();
+        }
+    }
+
     // ----- Value methods -----
 
     /** Return the identity hash code for the given LKQL selector list. */
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LKQLRuntimeException.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LKQLRuntimeException.java
index b18126800..5bdf0c080 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LKQLRuntimeException.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/exception/LKQLRuntimeException.java
@@ -58,13 +58,13 @@ private LKQLRuntimeException(String message) {
 
     // --- Misc exception
 
-    /**
-     * Create a new exception with an arbitrary message and a location.
-     *
-     * @param message The message of the exception.
-     * @param location The node where there is an error.
-     * @return The exception.
-     */
+    /** Create a new exception with an arbitrary message and a location. */
+    @CompilerDirectives.TruffleBoundary
+    public static LKQLRuntimeException fromMessage(String message, SourceLocation location) {
+        return new LKQLRuntimeException(fullErrorText(message, location));
+    }
+
+    /** Create a new exception with an arbitrary message and a location. */
     @CompilerDirectives.TruffleBoundary
     public static LKQLRuntimeException fromMessage(String message, Locatable location) {
         return new LKQLRuntimeException(fullErrorText(message, location));
@@ -81,6 +81,22 @@ public static LKQLRuntimeException fromMessage(String message) {
         return new LKQLRuntimeException(message);
     }
 
+    /**
+     * Create an exception from a Java exception with the location.
+     *
+     * @param e The Java exception.
+     * @param location The location of the LKQL call.
+     * @return The exception.
+     */
+    @CompilerDirectives.TruffleBoundary
+    public static LKQLRuntimeException fromJavaException(Throwable e, SourceLocation location) {
+        LKQLRuntimeException res =
+                new LKQLRuntimeException(
+                        fullErrorText("Error from Java bindings: " + e.getMessage(), location));
+        res.setStackTrace(e.getStackTrace());
+        return res;
+    }
+
     /**
      * Create an exception from a Java exception with the location.
      *
@@ -506,16 +522,16 @@ public static LKQLRuntimeException positionAfterNamedArgument(Locatable location
      * @param location The location of the error.
      * @return The base exception text for all exception.
      */
-    private static String baseErrorText(Locatable location) {
+    private static String baseErrorText(SourceLocation location) {
         if (LKQLLanguage.SUPPORT_COLOR) {
             return StringUtils.ANSI_BOLD
-                    + location.getLocation().toString()
+                    + location.toString()
                     + ":"
                     + StringUtils.ANSI_RED
                     + " error: "
                     + StringUtils.ANSI_RESET;
         } else {
-            return location.getLocation().toString() + ": error: ";
+            return location.toString() + ": error: ";
         }
     }
 
@@ -525,14 +541,14 @@ private static String baseErrorText(Locatable location) {
      * @param location The location to generate source representation for.
      * @return The string representing the LKQL source.
      */
-    private static String sourceText(Locatable location) {
+    private static String sourceText(SourceLocation location) {
         // Get the positional information
-        int startLine = location.getLocation().getStartLine();
-        int endLine = location.getLocation().getEndLine();
-        int startCol = location.getLocation().getStartColumn();
-        int endCol = location.getLocation().getEndColumn();
+        int startLine = location.getStartLine();
+        int endLine = location.getEndLine();
+        int startCol = location.getStartColumn();
+        int endCol = location.getEndColumn();
 
-        String[] lines = location.getLocation().getLines(startLine - 1, endLine);
+        String[] lines = location.getLines(startLine - 1, endLine);
         return StringUtils.underlineSource(
                 lines, startLine, startCol, endLine, endCol, StringUtils.ANSI_RED);
     }
@@ -545,6 +561,14 @@ private static String sourceText(Locatable location) {
      * @return The full error text.
      */
     private static String fullErrorText(String errorMessage, Locatable location) {
+        return baseErrorText(location.getLocation())
+                + errorMessage
+                + "\n"
+                + sourceText(location.getLocation())
+                + "\n";
+    }
+
+    private static String fullErrorText(String errorMessage, SourceLocation location) {
         return baseErrorText(location) + errorMessage + "\n" + sourceText(location) + "\n";
     }
 
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/FramingPass.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/FramingPass.java
index 1e5434fd0..85f98e730 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/FramingPass.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/FramingPass.java
@@ -445,21 +445,6 @@ public Void visit(Liblkqllang.NodePatternSelector nodePatternSelector) {
         return null;
     }
 
-    /**
-     * Create the frame description for a selector link.
-     *
-     * @param selectorLink The Langkit selector link node.
-     * @return Nothing.
-     */
-    @Override
-    public Void visit(Liblkqllang.SelectorLink selectorLink) {
-        selectorLink.fSelector().accept(this);
-        this.scriptFramesBuilder.openVirtualFrame(selectorLink);
-        selectorLink.fPattern().accept(this);
-        this.scriptFramesBuilder.closeFrame();
-        return null;
-    }
-
     // --- Non frame-changing nodes
 
     @Override
@@ -726,12 +711,48 @@ public Void visit(Liblkqllang.FilteredPattern filteredPattern) {
         return null;
     }
 
+    @Override
+    public Void visit(Liblkqllang.BoolPatternFalse boolPatternFalse) {
+        return null;
+    }
+
+    @Override
+    public Void visit(Liblkqllang.BoolPatternTrue boolPatternTrue) {
+        return null;
+    }
+
+    @Override
+    public Void visit(Liblkqllang.IntegerPattern integerPattern) {
+        return null;
+    }
+
+    @Override
+    public Void visit(Liblkqllang.ListPattern listPattern) {
+        traverseChildren(listPattern);
+        return null;
+    }
+
+    @Override
+    public Void visit(Liblkqllang.SplatPattern splatPattern) {
+        if (splatPattern.fBinding() != null) {
+            final String symbol = splatPattern.fBinding().getText();
+            this.scriptFramesBuilder.addBinding(symbol);
+        }
+        return null;
+    }
+
     @Override
     public Void visit(Liblkqllang.NullPattern nullPattern) {
         traverseChildren(nullPattern);
         return null;
     }
 
+    @Override
+    public Void visit(Liblkqllang.ObjectPattern objectPattern) {
+        traverseChildren(objectPattern);
+        return null;
+    }
+
     @Override
     public Void visit(Liblkqllang.UniversalPattern universalPattern) {
         traverseChildren(universalPattern);
@@ -744,6 +765,12 @@ public Void visit(Liblkqllang.RegexPattern regexPattern) {
         return null;
     }
 
+    @Override
+    public Void visit(Liblkqllang.TuplePattern tuplePattern) {
+        traverseChildren(tuplePattern);
+        return null;
+    }
+
     @Override
     public Void visit(Liblkqllang.ParenPattern parenPattern) {
         traverseChildren(parenPattern);
@@ -786,6 +813,12 @@ public Void visit(Liblkqllang.ListCompAssocList listCompAssocList) {
         return null;
     }
 
+    @Override
+    public Void visit(Liblkqllang.LkqlNodeList lkqlNodeList) {
+        traverseChildren(lkqlNodeList);
+        return null;
+    }
+
     @Override
     public Void visit(Liblkqllang.ListLiteral listLiteral) {
         traverseChildren(listLiteral);
@@ -804,6 +837,12 @@ public Void visit(Liblkqllang.ObjectAssoc objectAssoc) {
         return null;
     }
 
+    @Override
+    public Void visit(Liblkqllang.ObjectPatternAssoc objectPatternAssoc) {
+        traverseChildren(objectPatternAssoc);
+        return null;
+    }
+
     @Override
     public Void visit(Liblkqllang.AtObjectAssoc atObjectAssoc) {
         traverseChildren(atObjectAssoc);
@@ -816,6 +855,12 @@ public Void visit(Liblkqllang.AtObjectAssocList atObjectAssocList) {
         return null;
     }
 
+    @Override
+    public Void visit(Liblkqllang.BasePatternList basePatternList) {
+        traverseChildren(basePatternList);
+        return null;
+    }
+
     @Override
     public Void visit(Liblkqllang.AtObjectLiteral atObjectLiteral) {
         traverseChildren(atObjectLiteral);
@@ -906,18 +951,6 @@ public Void visit(Liblkqllang.NodeKindPattern nodeKindPattern) {
         return null;
     }
 
-    @Override
-    public Void visit(Liblkqllang.DetailExpr detailExpr) {
-        traverseChildren(detailExpr);
-        return null;
-    }
-
-    @Override
-    public Void visit(Liblkqllang.DetailPattern detailPattern) {
-        traverseChildren(detailPattern);
-        return null;
-    }
-
     @Override
     public Void visit(Liblkqllang.NodePatternDetailList nodePatternDetailList) {
         traverseChildren(nodePatternDetailList);
@@ -942,30 +975,6 @@ public Void visit(Liblkqllang.ExtendedNodePattern extendedNodePattern) {
         return null;
     }
 
-    @Override
-    public Void visit(Liblkqllang.ChainedPatternLinkList chainedPatternLinkList) {
-        traverseChildren(chainedPatternLinkList);
-        return null;
-    }
-
-    @Override
-    public Void visit(Liblkqllang.FieldLink fieldLink) {
-        traverseChildren(fieldLink);
-        return null;
-    }
-
-    @Override
-    public Void visit(Liblkqllang.PropertyLink propertyLink) {
-        traverseChildren(propertyLink);
-        return null;
-    }
-
-    @Override
-    public Void visit(Liblkqllang.ChainedNodePattern chainedNodePattern) {
-        traverseChildren(chainedNodePattern);
-        return null;
-    }
-
     @Override
     public Void visit(Liblkqllang.MatchArmList matchArmList) {
         traverseChildren(matchArmList);
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/TranslationPass.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/TranslationPass.java
index bcf86251f..e845dcb12 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/TranslationPass.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/langkit_translator/passes/TranslationPass.java
@@ -50,11 +50,9 @@
 import com.adacore.lkql_jit.nodes.expressions.literals.*;
 import com.adacore.lkql_jit.nodes.expressions.match.Match;
 import com.adacore.lkql_jit.nodes.expressions.match.MatchArm;
-import com.adacore.lkql_jit.nodes.expressions.match.MatchArmNodeGen;
 import com.adacore.lkql_jit.nodes.expressions.operators.*;
 import com.adacore.lkql_jit.nodes.expressions.value_read.*;
 import com.adacore.lkql_jit.nodes.patterns.*;
-import com.adacore.lkql_jit.nodes.patterns.chained_patterns.*;
 import com.adacore.lkql_jit.nodes.patterns.node_patterns.*;
 import com.adacore.lkql_jit.utils.ClosureDescriptor;
 import com.adacore.lkql_jit.utils.Constants;
@@ -837,6 +835,51 @@ public LKQLNode visit(Liblkqllang.FilteredPattern filteredPattern) {
         return new FilteredPattern(loc(filteredPattern), pattern, predicate);
     }
 
+    @Override
+    public LKQLNode visit(Liblkqllang.BoolPatternFalse boolPatternFalse) {
+        return BoolPatternNodeGen.create(loc(boolPatternFalse), false);
+    }
+
+    @Override
+    public LKQLNode visit(Liblkqllang.BoolPatternTrue boolPatternTrue) {
+        return BoolPatternNodeGen.create(loc(boolPatternTrue), true);
+    }
+
+    @Override
+    public LKQLNode visit(Liblkqllang.IntegerPattern integerPattern) {
+        try {
+            return IntegerPatternNodeGen.create(
+                    loc(integerPattern), Integer.parseInt(integerPattern.getText()));
+        } catch (NumberFormatException e) {
+            throw LKQLRuntimeException.fromMessage(
+                    "Invalid number literal for pattern", loc(integerPattern));
+        }
+    }
+
+    @Override
+    public LKQLNode visit(Liblkqllang.ListPattern listPattern) {
+        // Get the patterns inside the list
+        final List<BasePattern> listPatterns = new ArrayList<>();
+        for (Liblkqllang.LkqlNode pattern : listPattern.fPatterns().children()) {
+            listPatterns.add((BasePattern) pattern.accept(this));
+        }
+
+        return ListPatternNodeGen.create(
+                loc(listPattern), listPatterns.toArray(new BasePattern[0]));
+    }
+
+    @Override
+    public LKQLNode visit(Liblkqllang.SplatPattern splatPattern) {
+        // Get the binding value name
+        final String name = splatPattern.fBinding().getText();
+
+        // Get the slot of the binding
+        this.scriptFrames.declareBinding(name);
+        final int slot = this.scriptFrames.getBinding(name);
+
+        return new SplatPattern(loc(splatPattern), slot);
+    }
+
     /**
      * Visit a binding pattern node.
      *
@@ -896,6 +939,35 @@ public LKQLNode visit(Liblkqllang.NullPattern nullPattern) {
         return new NullPattern(loc(nullPattern));
     }
 
+    @Override
+    public LKQLNode visit(Liblkqllang.ObjectPattern objectPattern) {
+        // Get the association list and prepare the keys and values
+        final Liblkqllang.LkqlNodeList nodeList = objectPattern.fPatterns();
+        SplatPattern splat = null;
+        final int assocNumber = nodeList.getChildrenCount();
+        var keys = new ArrayList<String>();
+        var patterns = new ArrayList<BasePattern>();
+
+        // Iterate on the object associations and get keys and patterns
+        for (int i = 0; i < assocNumber; i++) {
+            final var assoc = nodeList.getChild(i);
+            if (assoc instanceof Liblkqllang.ObjectPatternAssoc objectPatternAssoc) {
+                patterns.add((BasePattern) objectPatternAssoc.fPattern().accept(this));
+                keys.add(objectPatternAssoc.fName().getText());
+            } else if (assoc instanceof Liblkqllang.SplatPattern splatPattern) {
+                splat = (SplatPattern) this.visit(splatPattern);
+            } else {
+                throw LKQLRuntimeException.shouldNotHappen("Invalid assoc in object pattern");
+            }
+        }
+
+        return ObjectPatternNodeGen.create(
+                loc(objectPattern),
+                patterns.toArray(new BasePattern[0]),
+                keys.toArray(new String[0]),
+                splat);
+    }
+
     /**
      * Visit a universal pattern node.
      *
@@ -921,7 +993,19 @@ public LKQLNode visit(Liblkqllang.RegexPattern regexPattern) {
         regex = regex.substring(1, regex.length() - 1);
 
         // Return the new regex pattern node
-        return new RegexPattern(loc(regexPattern), regex);
+        return RegexPatternNodeGen.create(loc(regexPattern), regex);
+    }
+
+    @Override
+    public LKQLNode visit(Liblkqllang.TuplePattern tuplePattern) {
+        // Get the sub-patterns inside the tuple pattern
+        final List<BasePattern> tuplePatterns = new ArrayList<>();
+        for (Liblkqllang.LkqlNode pattern : tuplePattern.fPatterns().children()) {
+            tuplePatterns.add((BasePattern) pattern.accept(this));
+        }
+
+        return TuplePatternNodeGen.create(
+                loc(tuplePattern), tuplePatterns.toArray(new BasePattern[0]));
     }
 
     /**
@@ -1053,6 +1137,11 @@ public LKQLNode visit(Liblkqllang.ListCompAssocList listCompAssocList) {
         return null;
     }
 
+    @Override
+    public LKQLNode visit(Liblkqllang.LkqlNodeList lkqlNodeList) {
+        return null;
+    }
+
     /**
      * Visit a list comprehension node.
      *
@@ -1116,6 +1205,11 @@ public LKQLNode visit(Liblkqllang.ObjectAssoc objectAssoc) {
         return null;
     }
 
+    @Override
+    public LKQLNode visit(Liblkqllang.ObjectPatternAssoc objectPatternAssoc) {
+        return null;
+    }
+
     @Override
     public LKQLNode visit(Liblkqllang.ObjectAssocList objectAssocList) {
         return null;
@@ -1156,6 +1250,11 @@ public LKQLNode visit(Liblkqllang.AtObjectAssocList atObjectAssocList) {
         return null;
     }
 
+    @Override
+    public LKQLNode visit(Liblkqllang.BasePatternList basePatternList) {
+        return null;
+    }
+
     /**
      * Visit an at object literal node.
      *
@@ -1555,36 +1654,6 @@ public LKQLNode visit(Liblkqllang.NodeKindPattern nodeKindPattern) {
         return new NodeKindPattern(loc(nodeKindPattern), nodeKindPattern.fKindName().getText());
     }
 
-    /**
-     * Visit a detail expression node.
-     *
-     * @param detailExpr The detail expression node from Langkit.
-     * @return The detail expression node for Truffle.
-     */
-    @Override
-    public LKQLNode visit(Liblkqllang.DetailExpr detailExpr) {
-        // Translate the detail expression fields
-        final Expr expr = (Expr) detailExpr.fExprValue().accept(this);
-
-        // Return the new detail expression node
-        return new DetailExpr(loc(detailExpr), expr);
-    }
-
-    /**
-     * Visit a detail pattern node.
-     *
-     * @param detailPattern The detail pattern node from Langkit
-     * @return The detail pattern node for Truffle.
-     */
-    @Override
-    public LKQLNode visit(Liblkqllang.DetailPattern detailPattern) {
-        // Translate the detail pattern fields
-        final BasePattern pattern = (BasePattern) detailPattern.fPatternValue().accept(this);
-
-        // Return the new detail pattern node
-        return new DetailPattern(loc(detailPattern), pattern);
-    }
-
     /**
      * Visit a node pattern field node.
      *
@@ -1595,7 +1664,7 @@ public LKQLNode visit(Liblkqllang.DetailPattern detailPattern) {
     public LKQLNode visit(Liblkqllang.NodePatternField nodePatternField) {
         // Translate the node pattern detail fields
         final String name = nodePatternField.fIdentifier().getText();
-        final DetailValue expected = (DetailValue) nodePatternField.fExpectedValue().accept(this);
+        final BasePattern expected = (BasePattern) nodePatternField.fExpectedValue().accept(this);
 
         // Return the new node pattern field detail
         return NodePatternFieldNodeGen.create(loc(nodePatternField), name, expected);
@@ -1612,8 +1681,8 @@ public LKQLNode visit(Liblkqllang.NodePatternProperty nodePatternProperty) {
         // Translate the node pattern detail fields
         final String propertyName = nodePatternProperty.fCall().fName().getText();
         final ArgList argList = (ArgList) nodePatternProperty.fCall().fArguments().accept(this);
-        final DetailValue expected =
-                (DetailValue) nodePatternProperty.fExpectedValue().accept(this);
+        final BasePattern expected =
+                (BasePattern) nodePatternProperty.fExpectedValue().accept(this);
 
         // Return the new node pattern property detail
         return NodePatternPropertyNodeGen.create(
@@ -1672,93 +1741,6 @@ public LKQLNode visit(Liblkqllang.ExtendedNodePattern extendedNodePattern) {
                 loc(extendedNodePattern), nodePattern, details.toArray(new NodePatternDetail[0]));
     }
 
-    // --- Chained node patterns
-
-    /**
-     * Visit a selector link node.
-     *
-     * @param selectorLink The selector link node from Langkit.
-     * @return The selector link node for Truffle.
-     */
-    @Override
-    public LKQLNode visit(Liblkqllang.SelectorLink selectorLink) {
-        // Translate the selector link selector
-        final SelectorCall selectorCall = (SelectorCall) selectorLink.fSelector().accept(this);
-
-        // Enter the selector link frame
-        this.scriptFrames.enterFrame(selectorLink);
-
-        // Translate the selector link pattern
-        final BasePattern pattern = (BasePattern) selectorLink.fPattern().accept(this);
-
-        // Exit the selector link frame
-        this.scriptFrames.exitFrame();
-
-        // Return the new selector link node
-        return new SelectorLink(loc(selectorLink), pattern, selectorCall);
-    }
-
-    /**
-     * Visit a field link node.
-     *
-     * @param fieldLink The field link node from Langkit.
-     * @return The field link node for Truffle.
-     */
-    @Override
-    public LKQLNode visit(Liblkqllang.FieldLink fieldLink) {
-        // Translate the field link fields
-        final BasePattern pattern = (BasePattern) fieldLink.fPattern().accept(this);
-        final String fieldName = fieldLink.fField().getText();
-
-        // Return the new field link node
-        return FieldLinkNodeGen.create(loc(fieldLink), pattern, fieldName);
-    }
-
-    /**
-     * Visit a property link node.
-     *
-     * @param propertyLink The property link node from Langkit.
-     * @return The property link node for Truffle.
-     */
-    @Override
-    public LKQLNode visit(Liblkqllang.PropertyLink propertyLink) {
-        // Translate the property link fields
-        final BasePattern pattern = (BasePattern) propertyLink.fPattern().accept(this);
-        final String propertyName = propertyLink.fProperty().fName().getText();
-        final ArgList argList = (ArgList) propertyLink.fProperty().fArguments().accept(this);
-
-        // Return the new field link node
-        return PropertyLinkNodeGen.create(loc(propertyLink), pattern, propertyName, argList);
-    }
-
-    @Override
-    public LKQLNode visit(Liblkqllang.ChainedPatternLinkList chainedPatternLinkList) {
-        return null;
-    }
-
-    /**
-     * Visit a chained node pattern node.
-     *
-     * @param chainedNodePattern The chained node pattern node from Langkit.
-     * @return The chained node pattern node for Truffle.
-     */
-    @Override
-    public LKQLNode visit(Liblkqllang.ChainedNodePattern chainedNodePattern) {
-        // Translate the chained node pattern fields
-        final BasePattern nodePattern =
-                (BasePattern) chainedNodePattern.fFirstPattern().accept(this);
-
-        // Get the chained pattern link list
-        final List<ChainedPatternLink> chain = new ArrayList<>();
-        for (Liblkqllang.LkqlNode node : chainedNodePattern.fChain().children()) {
-            chain.add((ChainedPatternLink) node.accept(this));
-        }
-
-        // Return the new chained node pattern node
-        return new ChainedNodePattern(
-                loc(chainedNodePattern), nodePattern, chain.toArray(new ChainedPatternLink[0]));
-    }
-
     // --- Pattern matching
 
     /**
@@ -1780,7 +1762,7 @@ public LKQLNode visit(Liblkqllang.MatchArm matchArm) {
         this.scriptFrames.exitFrame();
 
         // Return the new match arm
-        return MatchArmNodeGen.create(loc(matchArm), pattern, expr);
+        return new MatchArm(loc(matchArm), pattern, expr);
     }
 
     @Override
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorArm.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorArm.java
index ef1a3e3e4..7f5db70aa 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorArm.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/declarations/selector/SelectorArm.java
@@ -23,7 +23,7 @@
 package com.adacore.lkql_jit.nodes.declarations.selector;
 
 import com.adacore.lkql_jit.LKQLTypeSystemGen;
-import com.adacore.lkql_jit.built_ins.values.LKQLDepthNode;
+import com.adacore.lkql_jit.built_ins.values.LKQLDepthValue;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.nodes.LKQLNode;
 import com.adacore.lkql_jit.nodes.patterns.BasePattern;
@@ -97,22 +97,21 @@ public Object executeGeneric(VirtualFrame frame) {
      * @param node The node to match.
      * @return The result of the arm execution or null if the arm doesn't match.
      */
-    public SelectorRootNode.SelectorCallResult executeArm(VirtualFrame frame, LKQLDepthNode node) {
-        if (this.pattern.executeNode(frame, node.getNode())) {
+    public SelectorRootNode.SelectorCallResult executeArm(VirtualFrame frame, LKQLDepthValue node) {
+        if (this.pattern.executeValue(frame, node.value)) {
             // Execute the selector expression
             Object res = this.expr.executeGeneric(frame);
 
             // If the result of the expression is an array
             if (res instanceof Object[] resList) {
-                List<LKQLDepthNode> depthNodes = new ArrayList<>(resList.length);
+                List<LKQLDepthValue> depthNodes = new ArrayList<>(resList.length);
                 for (Object obj : resList) {
                     // For each object of the array, verify that it is a node
                     try {
                         if (!LKQLTypeSystemGen.isNullish(obj)) {
                             depthNodes.add(
-                                    new LKQLDepthNode(
-                                            node.getDepth() + 1,
-                                            LKQLTypeSystemGen.expectAdaNode(obj)));
+                                    new LKQLDepthValue(
+                                            node.depth + 1, LKQLTypeSystemGen.expectAdaNode(obj)));
                         }
                     }
 
@@ -123,7 +122,7 @@ public SelectorRootNode.SelectorCallResult executeArm(VirtualFrame frame, LKQLDe
                     }
                 }
                 return new SelectorRootNode.SelectorCallResult(
-                        this.expr.getMode(), depthNodes.toArray(new LKQLDepthNode[0]));
+                        this.expr.getMode(), depthNodes.toArray(new LKQLDepthValue[0]));
             }
 
             // If the result of the expression is nullish
@@ -135,7 +134,7 @@ else if (LKQLTypeSystemGen.isNullish(res)) {
             else if (LKQLTypeSystemGen.isAdaNode(res)) {
                 return new SelectorRootNode.SelectorCallResult(
                         this.expr.getMode(),
-                        new LKQLDepthNode(node.getDepth() + 1, LKQLTypeSystemGen.asAdaNode(res)));
+                        new LKQLDepthValue(node.depth + 1, LKQLTypeSystemGen.asAdaNode(res)));
             }
 
             // Throw an exception
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/SelectorDispatcher.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/SelectorDispatcher.java
index 2bc47df35..7c060f08b 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/SelectorDispatcher.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/dispatchers/SelectorDispatcher.java
@@ -22,7 +22,7 @@
 
 package com.adacore.lkql_jit.nodes.dispatchers;
 
-import com.adacore.lkql_jit.built_ins.values.LKQLDepthNode;
+import com.adacore.lkql_jit.built_ins.values.LKQLDepthValue;
 import com.adacore.lkql_jit.nodes.root_nodes.SelectorRootNode;
 import com.adacore.lkql_jit.runtime.Cell;
 import com.oracle.truffle.api.dsl.Cached;
@@ -40,7 +40,7 @@ public abstract class SelectorDispatcher extends Node {
 
     /** Function to execute the selector root node and get the result. */
     public abstract SelectorRootNode.SelectorCallResult executeDispatch(
-            SelectorRootNode rootNode, Cell[] closure, LKQLDepthNode node);
+            SelectorRootNode rootNode, Cell[] closure, LKQLDepthValue node);
 
     /**
      * Execute the selector root node with the direct path.
@@ -54,7 +54,7 @@ public abstract SelectorRootNode.SelectorCallResult executeDispatch(
     protected static SelectorRootNode.SelectorCallResult executeCached(
             SelectorRootNode rootNode,
             Cell[] closure,
-            LKQLDepthNode node,
+            LKQLDepthValue node,
             @Cached("create(rootNode.getRealCallTarget())") DirectCallNode directCallNode) {
         return (SelectorRootNode.SelectorCallResult) directCallNode.call(closure, node);
     }
@@ -71,7 +71,7 @@ protected static SelectorRootNode.SelectorCallResult executeCached(
     protected static SelectorRootNode.SelectorCallResult executeUncached(
             SelectorRootNode rootNode,
             Cell[] closure,
-            LKQLDepthNode node,
+            LKQLDepthValue node,
             @Cached IndirectCallNode indirectCallNode) {
         return (SelectorRootNode.SelectorCallResult)
                 indirectCallNode.call(rootNode.getRealCallTarget(), closure, node);
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/FunCall.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/FunCall.java
index 7859ccaec..0fddc8d9d 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/FunCall.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/FunCall.java
@@ -24,10 +24,7 @@
 
 import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.built_ins.BuiltInFunctionValue;
-import com.adacore.lkql_jit.built_ins.values.LKQLFunction;
-import com.adacore.lkql_jit.built_ins.values.LKQLProperty;
-import com.adacore.lkql_jit.built_ins.values.LKQLSelector;
-import com.adacore.lkql_jit.built_ins.values.LKQLUnit;
+import com.adacore.lkql_jit.built_ins.values.*;
 import com.adacore.lkql_jit.built_ins.values.interfaces.Nullish;
 import com.adacore.lkql_jit.built_ins.values.lists.LKQLSelectorList;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/Query.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/Query.java
index 861b17875..86930bb43 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/Query.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/Query.java
@@ -25,14 +25,12 @@
 import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.LKQLLanguage;
 import com.adacore.lkql_jit.LKQLTypeSystemGen;
-import com.adacore.lkql_jit.built_ins.values.LKQLDepthNode;
 import com.adacore.lkql_jit.built_ins.values.LKQLNull;
 import com.adacore.lkql_jit.built_ins.values.LKQLSelector;
 import com.adacore.lkql_jit.built_ins.values.interfaces.Iterable;
 import com.adacore.lkql_jit.built_ins.values.lists.LKQLList;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.nodes.patterns.BasePattern;
-import com.adacore.lkql_jit.nodes.patterns.chained_patterns.ChainedNodePattern;
 import com.adacore.lkql_jit.utils.Iterator;
 import com.adacore.lkql_jit.utils.LKQLTypesHelper;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
@@ -163,7 +161,7 @@ else if (LKQLTypeSystemGen.isLKQLList(fromObject)) {
         // If the query mode is all
         if (this.kind == Kind.ALL) {
             // Prepare the result
-            List<Libadalang.AdaNode> resNodes = new LinkedList<>();
+            List<Libadalang.AdaNode> resNodes = new ArrayList<>();
 
             // For each root node, explore it and return the result
             for (int i = fromNodes.length - 1; i >= 0; i--) {
@@ -205,24 +203,10 @@ private List<Libadalang.AdaNode> exploreAll(VirtualFrame frame, Iterator nodeIte
         // Iterate on all node in the iterator
         while (nodeIterator.hasNext()) {
             // Get the current node
-            Libadalang.AdaNode adaNode =
-                    this.throughExpr == null
-                            ? (Libadalang.AdaNode) nodeIterator.next()
-                            : ((LKQLDepthNode) nodeIterator.next()).getNode();
-
-            // If the pattern is a chained one
-            if (this.pattern instanceof ChainedNodePattern chainedNodePattern) {
-                Libadalang.AdaNode[] res = chainedNodePattern.executeChained(frame, adaNode);
-                if (res != null) {
-                    for (Libadalang.AdaNode resNode : res) resList.add(resNode);
-                }
-            }
+            Libadalang.AdaNode adaNode = (Libadalang.AdaNode) nodeIterator.next();
 
-            // Else, the pattern is a basic one
-            else {
-                if (this.pattern.executeNode(frame, adaNode)) {
-                    resList.add(adaNode);
-                }
+            if (this.pattern.executeValue(frame, adaNode)) {
+                resList.add(adaNode);
             }
         }
 
@@ -241,24 +225,10 @@ private Libadalang.AdaNode exploreFirst(VirtualFrame frame, Iterator nodeIterato
         // Iterate on all node in the iterator
         while (nodeIterator.hasNext()) {
             // Get the current node
-            Libadalang.AdaNode adaNode =
-                    this.throughExpr == null
-                            ? (Libadalang.AdaNode) nodeIterator.next()
-                            : ((LKQLDepthNode) nodeIterator.next()).getNode();
-
-            // If the pattern is a chained one
-            if (this.pattern instanceof ChainedNodePattern chainedNodePattern) {
-                Libadalang.AdaNode[] res = chainedNodePattern.executeChained(frame, adaNode);
-                if (res != null && res.length > 0) {
-                    return res[0];
-                }
-            }
+            Libadalang.AdaNode adaNode = (Libadalang.AdaNode) nodeIterator.next();
 
-            // Else, the pattern is a basic one
-            else {
-                if (this.pattern.executeNode(frame, adaNode)) {
-                    return adaNode;
-                }
+            if (this.pattern.executeValue(frame, adaNode)) {
+                return adaNode;
             }
         }
 
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/match/MatchArm.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/match/MatchArm.java
index 0301d07fa..9454561f4 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/match/MatchArm.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/match/MatchArm.java
@@ -22,14 +22,11 @@
 
 package com.adacore.lkql_jit.nodes.expressions.match;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.nodes.LKQLNode;
 import com.adacore.lkql_jit.nodes.expressions.Expr;
 import com.adacore.lkql_jit.nodes.patterns.BasePattern;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
-import com.oracle.truffle.api.dsl.Fallback;
-import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 /**
@@ -37,7 +34,7 @@
  *
  * @author Hugo GUERRIER
  */
-public abstract class MatchArm extends LKQLNode {
+public class MatchArm extends LKQLNode {
 
     // ----- Children -----
 
@@ -60,7 +57,7 @@ public abstract class MatchArm extends LKQLNode {
      * @param pattern The pattern of the match arm.
      * @param expr The result of the match arm.
      */
-    protected MatchArm(SourceLocation location, BasePattern pattern, Expr expr) {
+    public MatchArm(SourceLocation location, BasePattern pattern, Expr expr) {
         super(location);
         this.pattern = pattern;
         this.expr = expr;
@@ -93,52 +90,14 @@ public final Object executeGeneric(VirtualFrame frame) {
      * @param toMatch The node to match.
      * @return The result of the arm expression if the pattern is valid, null else.
      */
-    public abstract Object executeArm(VirtualFrame frame, Object toMatch);
-
-    /**
-     * Execute the matching arm on a node value.
-     *
-     * @param frame The frame to execute in.
-     * @param node The node value.
-     * @return The match expression if the pattern is valid.
-     */
-    @Specialization
-    protected Object onNode(VirtualFrame frame, Libadalang.AdaNode node) {
-        if (this.pattern.executeNode(frame, node)) {
-            return this.expr.executeGeneric(frame);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Execute the matching arm on a string value.
-     *
-     * @param frame The frame to execute in.
-     * @param str The string value.
-     * @return The match expression if the pattern is valid.
-     */
-    @Specialization
-    protected Object onString(VirtualFrame frame, String str) {
-        if (this.pattern.executeString(frame, str)) {
+    public Object executeArm(VirtualFrame frame, Object toMatch) {
+        if (this.pattern.executeValue(frame, toMatch)) {
             return this.expr.executeGeneric(frame);
         } else {
             return null;
         }
     }
 
-    /**
-     * Fallback when the value cannot be matched.
-     *
-     * @param frame The frame to execute in.
-     * @param other The value.
-     * @return Just null.
-     */
-    @Fallback
-    protected Object onOther(VirtualFrame frame, Object other) {
-        return null;
-    }
-
     // ----- Override methods -----
 
     /**
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/operators/IsClause.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/operators/IsClause.java
index f80774467..2b6e52256 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/operators/IsClause.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/expressions/operators/IsClause.java
@@ -80,7 +80,7 @@ protected IsClause(SourceLocation location, DummyLocation nodeLocation, BasePatt
      */
     @Specialization
     protected boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
-        return this.pattern.executeNode(frame, node);
+        return this.pattern.executeValue(frame, node);
     }
 
     /**
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BasePattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BasePattern.java
index 3cf20de73..d6117b232 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BasePattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BasePattern.java
@@ -22,10 +22,8 @@
 
 package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.nodes.LKQLNode;
-import com.adacore.lkql_jit.utils.LKQLTypesHelper;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
@@ -58,20 +56,8 @@ public final Object executeGeneric(VirtualFrame frame) {
      * Execute the pattern and get if the node fulfills it.
      *
      * @param frame The frame to execute the pattern in.
-     * @param node The node to verify.
+     * @param value The node to verify.
      * @return True of the node verify the pattern, false else.
      */
-    public abstract boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node);
-
-    /**
-     * Execute the pattern on a string.
-     *
-     * @param frame The frame to execute in.
-     * @param str The string to verify.
-     * @return True the string fulfills the pattern, false else.
-     */
-    public boolean executeString(VirtualFrame frame, String str) {
-        throw LKQLRuntimeException.wrongType(
-                LKQLTypesHelper.ADA_NODE, LKQLTypesHelper.LKQL_STRING, this);
-    }
+    public abstract boolean executeValue(VirtualFrame frame, Object value);
 }
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BindingPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BindingPattern.java
index 61b4cc173..2ad7d365c 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BindingPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BindingPattern.java
@@ -22,7 +22,6 @@
 
 package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.utils.functions.FrameUtils;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -44,7 +43,7 @@ public final class BindingPattern extends UnfilteredPattern {
     /** Pattern to execute once the binding done. */
     @Child
     @SuppressWarnings("FieldMayBeFinal")
-    private ValuePattern pattern;
+    public ValuePattern pattern;
 
     // ----- Constructors -----
 
@@ -64,31 +63,15 @@ public BindingPattern(SourceLocation location, int slot, ValuePattern pattern) {
     // ----- Execution methods -----
 
     /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
+     * @see BasePattern#executeValue(VirtualFrame, Object)
      */
     @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
+    public boolean executeValue(VirtualFrame frame, Object value) {
         // Do the node binding
-        FrameUtils.writeLocal(frame, this.slot, node);
+        FrameUtils.writeLocal(frame, this.slot, value);
 
         // Execute the pattern with the binding done
-        return this.pattern.executeNode(frame, node);
-    }
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeString(com.oracle.truffle.api.frame.VirtualFrame,
-     *     String)
-     */
-    @Override
-    public boolean executeString(VirtualFrame frame, String str) {
-        // Do the node binding
-        FrameUtils.writeLocal(frame, this.slot, str);
-
-        // Execute the pattern with the binding done
-        return this.pattern.executeString(frame, str);
+        return this.pattern.executeValue(frame, value);
     }
 
     // ----- Override methods -----
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/DetailValue.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BoolPattern.java
similarity index 62%
rename from lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/DetailValue.java
rename to lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BoolPattern.java
index 212f279ac..34d2e0860 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/DetailValue.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/BoolPattern.java
@@ -20,46 +20,36 @@
 -- <http://www.gnu.org/licenses/.>                                          --
 ----------------------------------------------------------------------------*/
 
-package com.adacore.lkql_jit.nodes.patterns.node_patterns;
+package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.lkql_jit.exception.LKQLRuntimeException;
-import com.adacore.lkql_jit.nodes.LKQLNode;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-/**
- * This node represents the detail value in an extended node pattern in the LKQL language.
- *
- * @author Hugo GUERRIER
- */
-public abstract class DetailValue extends LKQLNode {
+/** Pattern to match a boolean value */
+public abstract class BoolPattern extends ValuePattern {
 
-    /**
-     * Create a new detail value.
-     *
-     * @param location The location of the node in the source.
-     */
-    protected DetailValue(SourceLocation location) {
+    private final boolean toMatch;
+
+    protected BoolPattern(SourceLocation location, boolean toMatch) {
         super(location);
+        this.toMatch = toMatch;
     }
 
-    // ----- Execution methods -----
+    @Specialization
+    public boolean onBool(VirtualFrame frame, boolean val) {
+        return val == toMatch;
+    }
 
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.LKQLNode#executeGeneric(com.oracle.truffle.api.frame.VirtualFrame)
-     */
-    @Override
-    public Object executeGeneric(VirtualFrame frame) {
-        throw LKQLRuntimeException.shouldNotExecute(this);
+    @Fallback
+    public boolean onOther(VirtualFrame frame, Object other) {
+        return false;
     }
 
-    /**
-     * Execute the detail value to verify if it's valid.
-     *
-     * @param frame The frame to execute in.
-     * @param value The value to verify.
-     * @return True of the value is valid, false else.
-     */
-    public abstract boolean executeDetailValue(VirtualFrame frame, Object value);
+    @Override
+    public String toString(int indentLevel) {
+        return this.nodeRepresentation(
+                indentLevel, new String[] {"toMatch"}, new Object[] {this.toMatch});
+    }
 }
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/FilteredPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/FilteredPattern.java
index 2116a9c37..e062f5d75 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/FilteredPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/FilteredPattern.java
@@ -22,7 +22,6 @@
 
 package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.nodes.expressions.Expr;
 import com.adacore.lkql_jit.utils.LKQLTypesHelper;
@@ -67,14 +66,12 @@ public FilteredPattern(SourceLocation location, UnfilteredPattern pattern, Expr
     // ----- Execution methods -----
 
     /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
+     * @see BasePattern#executeValue(VirtualFrame, Object)
      */
     @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
+    public boolean executeValue(VirtualFrame frame, Object value) {
         // If the pattern match, execute the predicate
-        if (this.pattern.executeNode(frame, node)) {
+        if (this.pattern.executeValue(frame, value)) {
             // Try to execute the predicate in a boolean
             try {
                 return this.predicate.executeBoolean(frame);
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/IntegerPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/IntegerPattern.java
new file mode 100644
index 000000000..89299936a
--- /dev/null
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/IntegerPattern.java
@@ -0,0 +1,54 @@
+/*----------------------------------------------------------------------------
+--                             L K Q L   J I T                              --
+--                                                                          --
+--                     Copyright (C) 2022-2023, AdaCore                     --
+--                                                                          --
+-- This library is free software;  you can redistribute it and/or modify it --
+-- under terms of the  GNU General Public License  as published by the Free --
+-- Software  Foundation;  either version 3,  or (at your  option) any later --
+-- version. This library is distributed in the hope that it will be useful, --
+-- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
+-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE.                            --
+--                                                                          --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/.>                                          --
+----------------------------------------------------------------------------*/
+
+package com.adacore.lkql_jit.nodes.patterns;
+
+import com.adacore.lkql_jit.utils.source_location.SourceLocation;
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+
+public abstract class IntegerPattern extends ValuePattern {
+
+    private final long toMatch;
+
+    public IntegerPattern(SourceLocation loc, long toMatch) {
+        super(loc);
+        this.toMatch = toMatch;
+    }
+
+    @Specialization
+    public boolean onInt(VirtualFrame frame, long val) {
+        return val == toMatch;
+    }
+
+    @Fallback
+    public boolean onOther(VirtualFrame frame, Object other) {
+        return false;
+    }
+
+    @Override
+    public String toString(int indentLevel) {
+        return this.nodeRepresentation(
+                indentLevel, new String[] {"toMatch"}, new Object[] {this.toMatch});
+    }
+}
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/DetailExpr.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ListPattern.java
similarity index 51%
rename from lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/DetailExpr.java
rename to lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ListPattern.java
index 4e09c9149..853275614 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/DetailExpr.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ListPattern.java
@@ -20,69 +20,58 @@
 -- <http://www.gnu.org/licenses/.>                                          --
 ----------------------------------------------------------------------------*/
 
-package com.adacore.lkql_jit.nodes.patterns.node_patterns;
+package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.lkql_jit.LKQLTypeSystemGen;
-import com.adacore.lkql_jit.nodes.expressions.Expr;
-import com.adacore.lkql_jit.utils.functions.ObjectUtils;
+import com.adacore.lkql_jit.built_ins.values.lists.LKQLList;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.nodes.Node;
 
-/**
- * This node represents an expression detail value in the LKQL language.
- *
- * @author Hugo GUERRIER
- */
-public final class DetailExpr extends DetailValue {
+public abstract class ListPattern extends ValuePattern {
+    /** The sub-patterns for this list pattern. */
+    @Node.Children private final BasePattern[] patterns;
 
-    // ----- Children -----
-
-    /** The expression of the detail value. */
-    @Child
-    @SuppressWarnings("FieldMayBeFinal")
-    private Expr expr;
-
-    // ----- Constructors -----
-
-    /**
-     * Create a new detail expression node.
-     *
-     * @param location The location of the node in the source.
-     * @param expr The expression of the detail value.
-     */
-    public DetailExpr(SourceLocation location, Expr expr) {
+    public ListPattern(SourceLocation location, BasePattern[] patterns) {
         super(location);
-        this.expr = expr;
+        this.patterns = patterns;
     }
 
-    // ----- Execution methods -----
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.node_patterns.DetailValue#executeDetailValue(com.oracle.truffle.api.frame.VirtualFrame,
-     *     java.lang.Object)
-     */
-    @Override
-    public boolean executeDetailValue(VirtualFrame frame, Object value) {
-        // Execute the expression
-        Object expected = this.expr.executeGeneric(frame);
+    @Specialization
+    public boolean onList(VirtualFrame frame, LKQLList list) {
+        var lastMatch = 0;
+        for (int i = 0; i < list.getArraySize(); i++) {
+            var pattern = patterns[i];
+            lastMatch = i;
+            // SplatPattern matches the rest of the list
+            if (pattern instanceof SplatPattern) {
+                return pattern.executeValue(
+                        frame, new LKQLList(list.getSlice(i, list.getArraySize())));
+            }
+            // Else, fail on the first pattern that fails
+            else if (!pattern.executeValue(frame, list.get(i))) {
+                return false;
+            }
+        }
 
-        // Verify the equality
-        if (LKQLTypeSystemGen.isLKQLValue(value) && LKQLTypeSystemGen.isLKQLValue(expected)) {
-            InteropLibrary valueLibrary = InteropLibrary.getUncached(value);
-            InteropLibrary expectedLibrary = InteropLibrary.getUncached(expected);
-            return valueLibrary.isIdentical(value, expected, expectedLibrary);
-        } else {
-            return ObjectUtils.equals(value, expected);
+        if (lastMatch < patterns.length - 1) {
+            // If there are remaining patterns, there need to be only one, and it needs to be a
+            // SplatPattern.
+            if (lastMatch + 1 != patterns.length - 1
+                    || !(patterns[lastMatch + 1] instanceof SplatPattern)) {
+                return false;
+            }
         }
+
+        return true;
     }
 
-    // ----- Override methods -----
+    @Fallback
+    public boolean onOther(VirtualFrame frame, Object other) {
+        return false;
+    }
 
-    /**
-     * @see com.adacore.lkql_jit.nodes.LKQLNode#toString(int)
-     */
     @Override
     public String toString(int indentLevel) {
         return this.nodeRepresentation(indentLevel);
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/NotPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/NotPattern.java
index 266e1ec41..9051b6aa0 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/NotPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/NotPattern.java
@@ -22,7 +22,6 @@
 
 package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
@@ -56,23 +55,11 @@ public NotPattern(SourceLocation location, ValuePattern pattern) {
     // ----- Execution methods -----
 
     /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
+     * @see BasePattern#executeValue(VirtualFrame, Object)
      */
     @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
-        return !this.pattern.executeNode(frame, node);
-    }
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeString(com.oracle.truffle.api.frame.VirtualFrame,
-     *     String)
-     */
-    @Override
-    public boolean executeString(VirtualFrame frame, String str) {
-        return !this.pattern.executeString(frame, str);
+    public boolean executeValue(VirtualFrame frame, Object value) {
+        return !this.pattern.executeValue(frame, value);
     }
 
     // ----- Override methods -----
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/NullPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/NullPattern.java
index 2e701d786..8981e55b2 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/NullPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/NullPattern.java
@@ -22,7 +22,6 @@
 
 package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.built_ins.values.LKQLNull;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.frame.VirtualFrame;
@@ -48,13 +47,11 @@ public NullPattern(SourceLocation location) {
     // ----- Execution methods -----
 
     /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
+     * @see BasePattern#executeValue(VirtualFrame, Object)
      */
     @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
-        return node == LKQLNull.INSTANCE;
+    public boolean executeValue(VirtualFrame frame, Object value) {
+        return value == LKQLNull.INSTANCE;
     }
 
     // ----- Override methods -----
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ObjectPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ObjectPattern.java
new file mode 100644
index 000000000..e3f578c1d
--- /dev/null
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ObjectPattern.java
@@ -0,0 +1,123 @@
+/*----------------------------------------------------------------------------
+--                             L K Q L   J I T                              --
+--                                                                          --
+--                     Copyright (C) 2022-2023, AdaCore                     --
+--                                                                          --
+-- This library is free software;  you can redistribute it and/or modify it --
+-- under terms of the  GNU General Public License  as published by the Free --
+-- Software  Foundation;  either version 3,  or (at your  option) any later --
+-- version. This library is distributed in the hope that it will be useful, --
+-- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
+-- TABILITY or FITNESS FOR A PARTICULAR PURPOSE.                            --
+--                                                                          --
+-- As a special exception under Section 7 of GPL version 3, you are granted --
+-- additional permissions described in the GCC Runtime Library Exception,   --
+-- version 3.1, as published by the Free Software Foundation.               --
+--                                                                          --
+-- You should have received a copy of the GNU General Public License and    --
+-- a copy of the GCC Runtime Library Exception along with this program;     --
+-- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
+-- <http://www.gnu.org/licenses/.>                                          --
+----------------------------------------------------------------------------*/
+
+package com.adacore.lkql_jit.nodes.patterns;
+
+import com.adacore.lkql_jit.built_ins.values.LKQLObject;
+import com.adacore.lkql_jit.utils.Constants;
+import com.adacore.lkql_jit.utils.functions.ObjectUtils;
+import com.adacore.lkql_jit.utils.source_location.SourceLocation;
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.library.CachedLibrary;
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.object.DynamicObjectLibrary;
+import com.oracle.truffle.api.object.Shape;
+
+public abstract class ObjectPattern extends ValuePattern {
+
+    @Node.Children private final BasePattern[] patterns;
+    private final Shape shape;
+
+    @Node.Child private SplatPattern splat;
+
+    private final String[] keys;
+
+    protected ObjectPattern(
+            SourceLocation location, BasePattern[] patterns, String[] keys, SplatPattern splat) {
+        super(location);
+        assert patterns.length == keys.length;
+        this.patterns = patterns;
+        this.keys = keys;
+        this.splat = splat;
+        this.shape = Shape.newBuilder().build();
+    }
+
+    @Override
+    public String toString(int indentLevel) {
+        return this.nodeRepresentation(indentLevel);
+    }
+
+    @Specialization(limit = Constants.SPECIALIZED_LIB_LIMIT)
+    public boolean onObject(
+            VirtualFrame frame,
+            final LKQLObject object,
+            @CachedLibrary("object") DynamicObjectLibrary objectLibrary) {
+
+        for (int i = 0; i < keys.length; i++) {
+            var key = keys[i];
+            var pattern = patterns[i];
+            Object res = objectLibrary.getOrDefault(object, key, null);
+            if (res == null || !(pattern.executeValue(frame, res))) {
+                return false;
+            }
+        }
+
+        var objKeys = objectLibrary.getKeyArray(object);
+        if (objKeys.length > keys.length) {
+
+            // If there is a splat pattern and the object is bigger than the pattern, then it's
+            // OK: we'll return true, and bind the remaining keys if needed.
+
+            if (splat != null) {
+                // If the splat has a binding, we need to compute the new object without the keys
+                // that have already been matched
+                if (splat.hasBinding()) {
+                    LKQLObject splatObject = new LKQLObject(shape);
+                    DynamicObjectLibrary splatObjectLib = DynamicObjectLibrary.getUncached();
+
+                    for (var objKey : objKeys) {
+                        var keep = true;
+                        // Check if this key is part of the keys we match as part of the pattern
+                        // NOTE: There is probably a way to do better than this at a Truffle
+                        // level, because the keys of the pattern are known statically. For the
+                        // moment this is not a performance sensitive part of the code, so this
+                        // is fine.
+                        for (var patternKey : keys) {
+                            if (ObjectUtils.equals(objKey, patternKey)) {
+                                keep = false;
+                                break;
+                            }
+                        }
+                        // Add the assoc
+                        if (keep) {
+                            splatObjectLib.put(splatObject, objKey, object.getUncached(objKey));
+                        }
+                    }
+                    // Splat always returns true, and binds the object
+                    return splat.executeValue(frame, splatObject);
+                } else {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        return true;
+    }
+
+    @Fallback
+    public boolean onOther(VirtualFrame frame, Object other) {
+        return false;
+    }
+}
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/OrPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/OrPattern.java
index 2956fb247..a08fe072e 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/OrPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/OrPattern.java
@@ -22,7 +22,6 @@
 
 package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
@@ -63,31 +62,15 @@ public OrPattern(SourceLocation location, BasePattern left, BasePattern right) {
     // ----- Execution methods -----
 
     /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
+     * @see BasePattern#executeValue(VirtualFrame, Object)
      */
     @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
+    public boolean executeValue(VirtualFrame frame, Object value) {
         // Do the short circuit
-        if (this.left.executeNode(frame, node)) {
+        if (this.left.executeValue(frame, value)) {
             return true;
         } else {
-            return this.right.executeNode(frame, node);
-        }
-    }
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeString(com.oracle.truffle.api.frame.VirtualFrame,
-     *     String)
-     */
-    @Override
-    public boolean executeString(VirtualFrame frame, String str) {
-        if (this.left.executeString(frame, str)) {
-            return true;
-        } else {
-            return this.right.executeString(frame, str);
+            return this.right.executeValue(frame, value);
         }
     }
 
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ParenPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ParenPattern.java
index 83b0d049b..042d2dc0a 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ParenPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/ParenPattern.java
@@ -22,7 +22,6 @@
 
 package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
@@ -56,23 +55,11 @@ public ParenPattern(SourceLocation location, BasePattern pattern) {
     // ----- Execution methods -----
 
     /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
+     * @see BasePattern#executeValue(VirtualFrame, Object)
      */
     @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
-        return this.pattern.executeNode(frame, node);
-    }
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeString(com.oracle.truffle.api.frame.VirtualFrame,
-     *     String)
-     */
-    @Override
-    public boolean executeString(VirtualFrame frame, String str) {
-        return this.pattern.executeString(frame, str);
+    public boolean executeValue(VirtualFrame frame, Object value) {
+        return this.pattern.executeValue(frame, value);
     }
 
     // ----- Override methods -----
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/RegexPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/RegexPattern.java
index ff624b256..ae8641f12 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/RegexPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/RegexPattern.java
@@ -26,6 +26,8 @@
 import com.adacore.lkql_jit.built_ins.values.LKQLNull;
 import com.adacore.lkql_jit.built_ins.values.LKQLPattern;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
 /**
@@ -33,7 +35,7 @@
  *
  * @author Hugo GUERRIER
  */
-public final class RegexPattern extends ValuePattern {
+public abstract class RegexPattern extends ValuePattern {
 
     // ----- Attributes -----
 
@@ -53,26 +55,19 @@ public RegexPattern(SourceLocation location, String regex) {
         this.pattern = new LKQLPattern(this, regex, true);
     }
 
-    // ----- Execution methods -----
+    @Specialization
+    public boolean onAdaNode(VirtualFrame frame, Libadalang.AdaNode node) {
+        return node != LKQLNull.INSTANCE && this.pattern.contains(node.getText());
+    }
 
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
-     */
-    @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
-        return this.pattern.contains(node.getText()) && node != LKQLNull.INSTANCE;
+    @Specialization
+    public boolean onString(VirtualFrame frame, String value) {
+        return pattern.contains(value);
     }
 
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeString(com.oracle.truffle.api.frame.VirtualFrame,
-     *     String)
-     */
-    @Override
-    public boolean executeString(VirtualFrame frame, String str) {
-        return pattern.contains(str);
+    @Fallback
+    public boolean onOther(VirtualFrame frame, Object other) {
+        return false;
     }
 
     // ----- Override methods -----
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SelectorCall.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SelectorCall.java
index 5e64eabea..d1ff31ded 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SelectorCall.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SelectorCall.java
@@ -24,7 +24,6 @@
 
 import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.LKQLTypeSystemGen;
-import com.adacore.lkql_jit.built_ins.values.LKQLDepthNode;
 import com.adacore.lkql_jit.built_ins.values.LKQLSelector;
 import com.adacore.lkql_jit.built_ins.values.lists.LKQLList;
 import com.adacore.lkql_jit.built_ins.values.lists.LKQLSelectorList;
@@ -137,46 +136,6 @@ public boolean executeVerification(
         return isValid;
     }
 
-    /**
-     * Execute the filtering logic on the selector call with the given pattern and return the result
-     * list value. TODO: Move this method and logic in the SelectorLink node.
-     *
-     * @param frame The frame to execute in.
-     * @param node The node to execute the selector on.
-     * @param pattern The pattern to perform the filtering logic.
-     * @return The list of the validating nodes.
-     */
-    public LKQLList executeFiltering(
-            VirtualFrame frame, Libadalang.AdaNode node, BasePattern pattern) {
-        // Get the selector list
-        LKQLSelectorList selectorListValue = this.getSelectorList(frame, node);
-
-        // Prepare the result
-        LKQLList res;
-
-        // If the quantifier is all, verify it before returning anything
-        if (this.quantifier == Quantifier.ALL) {
-            if (this.isAll(frame, selectorListValue, pattern)) {
-                res = this.getFilteredList(frame, selectorListValue, pattern);
-            } else {
-                res = new LKQLList(new Libadalang.AdaNode[0]);
-            }
-        }
-
-        // Else, just get the filtered list
-        else {
-            res = this.getFilteredList(frame, selectorListValue, pattern);
-        }
-
-        // Do the bindings
-        if (this.bindingSlot > -1) {
-            this.doBinding(frame, res);
-        }
-
-        // Return the result
-        return res;
-    }
-
     // ----- Class methods -----
 
     /**
@@ -263,8 +222,8 @@ private boolean isAll(
         // Iterate on nodes
         Iterator iterator = selectorListValue.iterator();
         while (iterator.hasNext()) {
-            LKQLDepthNode depthNode = (LKQLDepthNode) iterator.next();
-            if (!pattern.executeNode(frame, depthNode.getNode())) return false;
+            Object value = iterator.next();
+            if (!pattern.executeValue(frame, value)) return false;
         }
 
         // Return validation of all nodes
@@ -284,8 +243,8 @@ private boolean isAny(
         // Iterate on nodes
         Iterator iterator = selectorListValue.iterator();
         while (iterator.hasNext()) {
-            LKQLDepthNode depthNode = (LKQLDepthNode) iterator.next();
-            if (pattern.executeNode(frame, depthNode.getNode())) return true;
+            Object val = iterator.next();
+            if (pattern.executeValue(frame, val)) return true;
         }
 
         // Return false if no node verify the pattern
@@ -303,19 +262,19 @@ private boolean isAny(
     private LKQLList getFilteredList(
             VirtualFrame frame, LKQLSelectorList selectorListValue, BasePattern pattern) {
         // Prepare the result
-        List<Libadalang.AdaNode> resList = new ArrayList<>();
+        List<Object> resList = new ArrayList<>();
 
         // Iterate on nodes
         Iterator iterator = selectorListValue.iterator();
         while (iterator.hasNext()) {
-            LKQLDepthNode depthNode = (LKQLDepthNode) iterator.next();
-            if (pattern.executeNode(frame, depthNode.getNode())) {
-                resList.add(depthNode.getNode());
+            Object value = iterator.next();
+            if (pattern.executeValue(frame, value)) {
+                resList.add(value);
             }
         }
 
         // Return the result
-        return new LKQLList(resList.toArray(new Libadalang.AdaNode[0]));
+        return new LKQLList(resList.toArray(new Object[0]));
     }
 
     /**
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/SelectorLink.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SplatPattern.java
similarity index 55%
rename from lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/SelectorLink.java
rename to lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SplatPattern.java
index f3d2a4f02..ee191ce0a 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/SelectorLink.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/SplatPattern.java
@@ -20,62 +20,42 @@
 -- <http://www.gnu.org/licenses/.>                                          --
 ----------------------------------------------------------------------------*/
 
-package com.adacore.lkql_jit.nodes.patterns.chained_patterns;
+package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.libadalang.Libadalang;
-import com.adacore.lkql_jit.nodes.patterns.BasePattern;
-import com.adacore.lkql_jit.nodes.patterns.SelectorCall;
+import com.adacore.lkql_jit.utils.functions.FrameUtils;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
-/**
- * This node represents a selector in a chained pattern.
- *
- * @author Hugo GUERRIER
- */
-public final class SelectorLink extends ChainedPatternLink {
+public class SplatPattern extends ValuePattern {
+    private final int slot;
 
-    // ----- Children -----
-
-    /** The selector call to perform during link execution. */
-    @Child
-    @SuppressWarnings("FieldMayBeFinal")
-    private SelectorCall selectorCall;
-
-    // ----- Constructors -----
-
-    /**
-     * Create a new selector link node.
-     *
-     * @param location The location of the node in the source.
-     * @param pattern The pattern to verify.
-     * @param selectorCall The selector call.
-     */
-    public SelectorLink(SourceLocation location, BasePattern pattern, SelectorCall selectorCall) {
-        super(location, pattern);
-        this.selectorCall = selectorCall;
+    public SplatPattern(SourceLocation location) {
+        super(location);
+        this.slot = -1;
     }
 
-    // ----- Execution methods -----
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.chained_patterns.ChainedPatternLink#executeLink(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
-     */
-    @Override
-    public Libadalang.AdaNode[] executeLink(VirtualFrame frame, Libadalang.AdaNode node) {
-        return (Libadalang.AdaNode[])
-                this.selectorCall.executeFiltering(frame, node, this.pattern).getContent();
+    public SplatPattern(SourceLocation location, int slot) {
+        super(location);
+        this.slot = slot;
     }
 
-    // ----- Override methods -----
+    public boolean hasBinding() {
+        return this.slot != -1;
+    }
 
-    /**
-     * @see com.adacore.lkql_jit.nodes.LKQLNode#toString(int)
-     */
     @Override
     public String toString(int indentLevel) {
         return this.nodeRepresentation(indentLevel);
     }
+
+    @Override
+    public boolean executeValue(VirtualFrame frame, Object value) {
+        if (hasBinding()) {
+            // Do the node binding
+            FrameUtils.writeLocal(frame, this.slot, value);
+        }
+
+        // Splat pattern always matches
+        return true;
+    }
 }
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/DetailPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/TuplePattern.java
similarity index 51%
rename from lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/DetailPattern.java
rename to lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/TuplePattern.java
index ec006de9f..58128bc00 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/DetailPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/TuplePattern.java
@@ -20,71 +20,45 @@
 -- <http://www.gnu.org/licenses/.>                                          --
 ----------------------------------------------------------------------------*/
 
-package com.adacore.lkql_jit.nodes.patterns.node_patterns;
+package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.lkql_jit.LKQLTypeSystemGen;
-import com.adacore.lkql_jit.exception.LKQLRuntimeException;
-import com.adacore.lkql_jit.nodes.patterns.BasePattern;
-import com.adacore.lkql_jit.utils.LKQLTypesHelper;
+import com.adacore.lkql_jit.built_ins.values.LKQLTuple;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
+import com.oracle.truffle.api.dsl.Fallback;
+import com.oracle.truffle.api.dsl.Specialization;
 import com.oracle.truffle.api.frame.VirtualFrame;
+import com.oracle.truffle.api.nodes.ExplodeLoop;
+import com.oracle.truffle.api.nodes.Node;
 
-/**
- * This node represents a pattern detail value in the LKQL language.
- *
- * @author Hugo GUERRIER
- */
-public final class DetailPattern extends DetailValue {
+public abstract class TuplePattern extends ValuePattern {
+    /** The sub-patterns for this tuple pattern. */
+    @Node.Children private final BasePattern[] patterns;
 
-    // ----- Children -----
-
-    /** The pattern to verify for the detail value. */
-    @Child
-    @SuppressWarnings("FieldMayBeFinal")
-    private BasePattern pattern;
-
-    // ----- Constructors -----
-
-    /**
-     * Create a new pattern detail.
-     *
-     * @param location The location of the node in the source.
-     * @param pattern The pattern to verify.
-     */
-    public DetailPattern(SourceLocation location, BasePattern pattern) {
+    public TuplePattern(SourceLocation location, BasePattern[] patterns) {
         super(location);
-        this.pattern = pattern;
+        this.patterns = patterns;
     }
 
-    // ----- Execution methods -----
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.node_patterns.DetailValue#executeDetailValue(com.oracle.truffle.api.frame.VirtualFrame,
-     *     java.lang.Object)
-     */
-    @Override
-    public boolean executeDetailValue(VirtualFrame frame, Object value) {
-        // Check if the value is a string
-        if (LKQLTypeSystemGen.isString(value)) {
-            return this.pattern.executeString(frame, LKQLTypeSystemGen.asString(value));
+    @Specialization
+    @ExplodeLoop
+    public boolean onTuple(VirtualFrame frame, LKQLTuple tuple) {
+        if (tuple.getArraySize() != patterns.length) {
+            return false;
         }
 
-        // Verify that the value is a node
-        if (!LKQLTypeSystemGen.isAdaNode(value)) {
-            throw LKQLRuntimeException.wrongType(
-                    LKQLTypesHelper.ADA_NODE, LKQLTypesHelper.fromJava(value), this);
+        for (int i = 0; i < tuple.getArraySize(); i++) {
+            if (!patterns[i].executeValue(frame, tuple.get(i))) {
+                return false;
+            }
         }
-
-        // Execute the pattern with the node
-        return this.pattern.executeNode(frame, LKQLTypeSystemGen.asAdaNode(value));
+        return true;
     }
 
-    // ----- Override methods -----
+    @Fallback
+    public boolean onOther(VirtualFrame frame, Object other) {
+        return false;
+    }
 
-    /**
-     * @see com.adacore.lkql_jit.nodes.LKQLNode#toString(int)
-     */
     @Override
     public String toString(int indentLevel) {
         return this.nodeRepresentation(indentLevel);
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/UniversalPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/UniversalPattern.java
index d8bf28560..098c01572 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/UniversalPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/UniversalPattern.java
@@ -22,7 +22,6 @@
 
 package com.adacore.lkql_jit.nodes.patterns;
 
-import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
@@ -47,22 +46,10 @@ public UniversalPattern(SourceLocation location) {
     // ----- Execution methods -----
 
     /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
+     * @see BasePattern#executeValue(VirtualFrame, Object)
      */
     @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
-        return true;
-    }
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeString(com.oracle.truffle.api.frame.VirtualFrame,
-     *     String)
-     */
-    @Override
-    public boolean executeString(VirtualFrame frame, String str) {
+    public boolean executeValue(VirtualFrame frame, Object value) {
         return true;
     }
 
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/ChainedNodePattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/ChainedNodePattern.java
deleted file mode 100644
index 0314d8cfe..000000000
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/ChainedNodePattern.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*----------------------------------------------------------------------------
---                             L K Q L   J I T                              --
---                                                                          --
---                     Copyright (C) 2022-2023, AdaCore                     --
---                                                                          --
--- This library is free software;  you can redistribute it and/or modify it --
--- under terms of the  GNU General Public License  as published by the Free --
--- Software  Foundation;  either version 3,  or (at your  option) any later --
--- version. This library is distributed in the hope that it will be useful, --
--- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
--- TABILITY or FITNESS FOR A PARTICULAR PURPOSE.                            --
---                                                                          --
--- As a special exception under Section 7 of GPL version 3, you are granted --
--- additional permissions described in the GCC Runtime Library Exception,   --
--- version 3.1, as published by the Free Software Foundation.               --
---                                                                          --
--- You should have received a copy of the GNU General Public License and    --
--- a copy of the GCC Runtime Library Exception along with this program;     --
--- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
--- <http://www.gnu.org/licenses/.>                                          --
-----------------------------------------------------------------------------*/
-
-package com.adacore.lkql_jit.nodes.patterns.chained_patterns;
-
-import com.adacore.libadalang.Libadalang;
-import com.adacore.lkql_jit.exception.LKQLRuntimeException;
-import com.adacore.lkql_jit.nodes.patterns.BasePattern;
-import com.adacore.lkql_jit.nodes.patterns.ValuePattern;
-import com.adacore.lkql_jit.utils.functions.ListUtils;
-import com.adacore.lkql_jit.utils.source_location.SourceLocation;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This node represents a chained node pattern in the LKQL language.
- *
- * @author Hugo GUERRIER
- */
-public final class ChainedNodePattern extends ValuePattern {
-
-    // ----- Children -----
-
-    /** The node pattern start of the chain. */
-    @Child
-    @SuppressWarnings("FieldMayBeFinal")
-    private BasePattern nodePattern;
-
-    /** The chain for the node pattern. */
-    @Children private final ChainedPatternLink[] chain;
-
-    // ----- Constructors -----
-
-    /**
-     * Create a new chained node pattern with parameters.
-     *
-     * @param location The location of the node in the source.
-     * @param nodePattern The node pattern.
-     * @param chain The chain for the node pattern.
-     */
-    public ChainedNodePattern(
-            SourceLocation location, BasePattern nodePattern, ChainedPatternLink[] chain) {
-        super(location);
-        this.nodePattern = nodePattern;
-        this.chain = chain;
-    }
-
-    // ----- Execution methods -----
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
-     */
-    @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
-        throw LKQLRuntimeException.wrongPatternType("ChainedNodePattern", this);
-    }
-
-    /**
-     * Get the result node from the chained pattern.
-     *
-     * @param frame The frame to execute in.
-     * @param node The node to verify.
-     * @return The result of the chained pattern.
-     */
-    public Libadalang.AdaNode[] executeChained(VirtualFrame frame, Libadalang.AdaNode node) {
-        if (this.nodePattern.executeNode(frame, node)) {
-            return this.executeLink(frame, 0, node);
-        } else {
-            return new Libadalang.AdaNode[0];
-        }
-    }
-
-    // ----- Class methods -----
-
-    /**
-     * Execute the link of the chain at the given index with the given node.
-     *
-     * @param frame The frame to execute in.
-     * @param index The index of the link to execute.
-     * @param node The node to execute the link on.
-     * @return The array of the link execution result.
-     */
-    private Libadalang.AdaNode[] executeLink(
-            VirtualFrame frame, int index, Libadalang.AdaNode node) {
-        // Get the result of the link execution
-        Libadalang.AdaNode[] linkRes = this.chain[index].executeLink(frame, node);
-
-        // If the link is the last one return the result
-        if (index >= this.chain.length - 1) {
-            return linkRes;
-        }
-
-        // Else, execute the next link on the results of the current link
-        else {
-            // Prepare the result list
-            List<Libadalang.AdaNode> resList = new ArrayList<>();
-
-            // Add to the result with the already containing verification
-            for (Libadalang.AdaNode linkNode : linkRes) {
-                for (Libadalang.AdaNode toAdd : this.executeLink(frame, index + 1, linkNode)) {
-                    if (!ListUtils.contains(resList, toAdd)) {
-                        resList.add(toAdd);
-                    }
-                }
-            }
-
-            // Return the result
-            return resList.toArray(new Libadalang.AdaNode[0]);
-        }
-    }
-
-    // ----- Override methods -----
-
-    /**
-     * @see com.adacore.lkql_jit.nodes.LKQLNode#toString(int)
-     */
-    @Override
-    public String toString(int indentLevel) {
-        return this.nodeRepresentation(indentLevel);
-    }
-}
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/ChainedPatternLink.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/ChainedPatternLink.java
deleted file mode 100644
index 6068b614b..000000000
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/ChainedPatternLink.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*----------------------------------------------------------------------------
---                             L K Q L   J I T                              --
---                                                                          --
---                     Copyright (C) 2022-2023, AdaCore                     --
---                                                                          --
--- This library is free software;  you can redistribute it and/or modify it --
--- under terms of the  GNU General Public License  as published by the Free --
--- Software  Foundation;  either version 3,  or (at your  option) any later --
--- version. This library is distributed in the hope that it will be useful, --
--- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
--- TABILITY or FITNESS FOR A PARTICULAR PURPOSE.                            --
---                                                                          --
--- As a special exception under Section 7 of GPL version 3, you are granted --
--- additional permissions described in the GCC Runtime Library Exception,   --
--- version 3.1, as published by the Free Software Foundation.               --
---                                                                          --
--- You should have received a copy of the GNU General Public License and    --
--- a copy of the GCC Runtime Library Exception along with this program;     --
--- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
--- <http://www.gnu.org/licenses/.>                                          --
-----------------------------------------------------------------------------*/
-
-package com.adacore.lkql_jit.nodes.patterns.chained_patterns;
-
-import com.adacore.libadalang.Libadalang;
-import com.adacore.lkql_jit.LKQLTypeSystemGen;
-import com.adacore.lkql_jit.built_ins.values.lists.LKQLList;
-import com.adacore.lkql_jit.exception.LKQLRuntimeException;
-import com.adacore.lkql_jit.nodes.LKQLNode;
-import com.adacore.lkql_jit.nodes.patterns.BasePattern;
-import com.adacore.lkql_jit.utils.LKQLTypesHelper;
-import com.adacore.lkql_jit.utils.source_location.SourceLocation;
-import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.UnexpectedResultException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This node is the base of all chained pattern links in LKQL language.
- *
- * @author Hugo GUERRIER
- */
-public abstract class ChainedPatternLink extends LKQLNode {
-
-    // ----- Children -----
-
-    /** The pattern to match in the link. */
-    @Child
-    @SuppressWarnings("FieldMayBeFinal")
-    protected BasePattern pattern;
-
-    // ----- Constructors -----
-
-    /**
-     * Create a new chained pattern link.
-     *
-     * @param location The location of the node in the source.
-     * @param pattern The pattern to match.
-     */
-    protected ChainedPatternLink(SourceLocation location, BasePattern pattern) {
-        super(location);
-        this.pattern = pattern;
-    }
-
-    // ----- Execution methods -----
-
-    /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.LKQLNode#executeGeneric(com.oracle.truffle.api.frame.VirtualFrame)
-     */
-    @Override
-    public final Object executeGeneric(VirtualFrame frame) {
-        throw LKQLRuntimeException.shouldNotExecute(this);
-    }
-
-    /**
-     * Execute the link with a node and return the list of the matched node.
-     *
-     * @param frame The frame to execute the link in.
-     * @param node The input node in the chain.
-     * @return The result of the chain link execution.
-     */
-    public abstract Libadalang.AdaNode[] executeLink(VirtualFrame frame, Libadalang.AdaNode node);
-
-    // ----- Class methods -----
-
-    /**
-     * Do the pattern filtering logic on the given result object.
-     *
-     * @param frame The frame to execute the pattern in.
-     * @param resultObject The result object to filter and add in the result.
-     * @return The result of the filtering.
-     */
-    protected Libadalang.AdaNode[] doPatternFiltering(VirtualFrame frame, Object resultObject) {
-        // Prepare the result list
-        List<Libadalang.AdaNode> resList = new ArrayList<>();
-
-        // If the result object is a node
-        if (LKQLTypeSystemGen.isAdaNode(resultObject)) {
-            if (this.pattern.executeNode(frame, LKQLTypeSystemGen.asAdaNode(resultObject))) {
-                resList.add(LKQLTypeSystemGen.asAdaNode(resultObject));
-            }
-        }
-
-        // If the result object is a list of node
-        else if (LKQLTypeSystemGen.isLKQLList(resultObject)) {
-            LKQLList listValue = LKQLTypeSystemGen.asLKQLList(resultObject);
-            for (int i = 0; i < listValue.size(); i++) {
-                try {
-                    Libadalang.AdaNode toVerify = LKQLTypeSystemGen.expectAdaNode(listValue.get(i));
-                    if (this.pattern.executeNode(frame, toVerify)) {
-                        resList.add(toVerify);
-                    }
-                } catch (UnexpectedResultException e) {
-                    throw LKQLRuntimeException.wrongType(
-                            LKQLTypesHelper.ADA_NODE,
-                            LKQLTypesHelper.fromJava(e.getResult()),
-                            this);
-                }
-            }
-        }
-
-        // Else, throw a type exception
-        else {
-            throw LKQLRuntimeException.wrongType(
-                    LKQLTypesHelper.LKQL_LIST, LKQLTypesHelper.fromJava(resultObject), this);
-        }
-
-        // Return the result as an array of node
-        return resList.toArray(new Libadalang.AdaNode[0]);
-    }
-}
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/FieldLink.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/FieldLink.java
deleted file mode 100644
index 81b8d5ed4..000000000
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/FieldLink.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*----------------------------------------------------------------------------
---                             L K Q L   J I T                              --
---                                                                          --
---                     Copyright (C) 2022-2023, AdaCore                     --
---                                                                          --
--- This library is free software;  you can redistribute it and/or modify it --
--- under terms of the  GNU General Public License  as published by the Free --
--- Software  Foundation;  either version 3,  or (at your  option) any later --
--- version. This library is distributed in the hope that it will be useful, --
--- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
--- TABILITY or FITNESS FOR A PARTICULAR PURPOSE.                            --
---                                                                          --
--- As a special exception under Section 7 of GPL version 3, you are granted --
--- additional permissions described in the GCC Runtime Library Exception,   --
--- version 3.1, as published by the Free Software Foundation.               --
---                                                                          --
--- You should have received a copy of the GNU General Public License and    --
--- a copy of the GCC Runtime Library Exception along with this program;     --
--- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
--- <http://www.gnu.org/licenses/.>                                          --
-----------------------------------------------------------------------------*/
-
-package com.adacore.lkql_jit.nodes.patterns.chained_patterns;
-
-import com.adacore.libadalang.Libadalang;
-import com.adacore.lkql_jit.built_ins.values.LKQLProperty;
-import com.adacore.lkql_jit.exception.LKQLRuntimeException;
-import com.adacore.lkql_jit.nodes.patterns.BasePattern;
-import com.adacore.lkql_jit.utils.source_location.SourceLocation;
-import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.frame.VirtualFrame;
-
-/**
- * This node represents a field link in a chained pattern in the LKQL language.
- *
- * @author Hugo GUERRIER
- */
-public abstract class FieldLink extends ChainedPatternLink {
-
-    // ----- Attributes -----
-
-    /** The name of the field to query. */
-    protected final String fieldName;
-
-    // ----- Constructors -----
-
-    /**
-     * Create a new field link node.
-     *
-     * @param location The location of the node in the source.
-     * @param pattern The pattern to verify.
-     * @param fieldName The name of the field to query.
-     */
-    protected FieldLink(SourceLocation location, BasePattern pattern, String fieldName) {
-        super(location, pattern);
-        this.fieldName = fieldName;
-    }
-
-    // ----- Execution methods -----
-
-    /**
-     * Execute the field link with the cached strategy.
-     *
-     * @param frame The frame to execute the link in.
-     * @param node The node get the field from.
-     * @param property The cached property reference.
-     * @return The result of the link.
-     */
-    @Specialization(guards = {"node == property.getNode()", "property.getDescription() != null"})
-    protected Libadalang.AdaNode[] fieldCached(
-            VirtualFrame frame,
-            @SuppressWarnings("unused") Libadalang.AdaNode node,
-            @Cached("create(fieldName, node)") LKQLProperty property) {
-        // Get the value of the field
-        Object value = property.executeAsField(this);
-
-        // Do the pattern filtering
-        return this.doPatternFiltering(frame, value);
-    }
-
-    /**
-     * Execute the field link with the un-cached strategy.
-     *
-     * @param frame The frame to execute the link in.
-     * @param node The node get the field from.
-     * @return The result of the link.
-     */
-    @Specialization(replaces = "fieldCached")
-    protected Libadalang.AdaNode[] fieldUnached(VirtualFrame frame, Libadalang.AdaNode node) {
-        // Get the field method
-        LKQLProperty property = new LKQLProperty(this.fieldName, node);
-
-        // Verify if the field method is null
-        if (property.getDescription() == null) {
-            throw LKQLRuntimeException.noSuchField(this);
-        }
-
-        // Execute the field detail
-        return this.fieldCached(frame, node, property);
-    }
-
-    // ----- Override methods -----
-
-    /**
-     * @see com.adacore.lkql_jit.nodes.LKQLNode#toString(int)
-     */
-    @Override
-    public String toString(int indentLevel) {
-        return this.nodeRepresentation(
-                indentLevel, new String[] {"fieldName"}, new Object[] {this.fieldName});
-    }
-}
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/PropertyLink.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/PropertyLink.java
deleted file mode 100644
index 34be6a0cb..000000000
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/chained_patterns/PropertyLink.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*----------------------------------------------------------------------------
---                             L K Q L   J I T                              --
---                                                                          --
---                     Copyright (C) 2022-2023, AdaCore                     --
---                                                                          --
--- This library is free software;  you can redistribute it and/or modify it --
--- under terms of the  GNU General Public License  as published by the Free --
--- Software  Foundation;  either version 3,  or (at your  option) any later --
--- version. This library is distributed in the hope that it will be useful, --
--- but WITHOUT ANY WARRANTY;  without even the implied warranty of MERCHAN- --
--- TABILITY or FITNESS FOR A PARTICULAR PURPOSE.                            --
---                                                                          --
--- As a special exception under Section 7 of GPL version 3, you are granted --
--- additional permissions described in the GCC Runtime Library Exception,   --
--- version 3.1, as published by the Free Software Foundation.               --
---                                                                          --
--- You should have received a copy of the GNU General Public License and    --
--- a copy of the GCC Runtime Library Exception along with this program;     --
--- see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see    --
--- <http://www.gnu.org/licenses/.>                                          --
-----------------------------------------------------------------------------*/
-
-package com.adacore.lkql_jit.nodes.patterns.chained_patterns;
-
-import com.adacore.libadalang.Libadalang;
-import com.adacore.lkql_jit.built_ins.values.LKQLProperty;
-import com.adacore.lkql_jit.exception.LKQLRuntimeException;
-import com.adacore.lkql_jit.nodes.arguments.ArgList;
-import com.adacore.lkql_jit.nodes.patterns.BasePattern;
-import com.adacore.lkql_jit.utils.source_location.SourceLocation;
-import com.oracle.truffle.api.dsl.Cached;
-import com.oracle.truffle.api.dsl.Specialization;
-import com.oracle.truffle.api.frame.VirtualFrame;
-
-/**
- * This node represents a property link in a chained pattern in the LKQL language.
- *
- * @author Hugo GUERRIER
- */
-public abstract class PropertyLink extends ChainedPatternLink {
-
-    // ----- Attributes -----
-
-    /** The name of the property to call. */
-    protected final String propertyName;
-
-    // ----- Children -----
-
-    /** The list of the argument for the property call. */
-    @Child
-    @SuppressWarnings("FieldMayBeFinal")
-    protected ArgList argList;
-
-    // ----- Constructors -----
-
-    /**
-     * Create a new property link node.
-     *
-     * @param location The token location in the source.
-     * @param pattern The pattern to verify.
-     * @param propertyName The name of the property to call.
-     * @param argList The argument list.
-     */
-    public PropertyLink(
-            SourceLocation location, BasePattern pattern, String propertyName, ArgList argList) {
-        super(location, pattern);
-        this.propertyName = propertyName;
-        this.argList = argList;
-    }
-
-    // ----- Execution methods -----
-
-    /**
-     * Execute the property link with the cached property.
-     *
-     * @param frame The frame to execute the link in.
-     * @param node The node get the property from.
-     * @param property The cached property reference.
-     * @return The result of the link.
-     */
-    @Specialization(guards = {"node == property.getNode()", "property.getDescription() != null"})
-    protected Libadalang.AdaNode[] propertyCached(
-            VirtualFrame frame,
-            @SuppressWarnings("unused") Libadalang.AdaNode node,
-            @Cached("create(propertyName, node)") LKQLProperty property) {
-        // Evaluate the arguments
-        Object[] arguments = new Object[this.argList.getArgs().length];
-        for (int i = 0; i < arguments.length; i++) {
-            arguments[i] = this.argList.getArgs()[i].getArgExpr().executeGeneric(frame);
-        }
-
-        // Get the property result
-        Object value = property.executeAsProperty(this, this.argList, arguments);
-
-        // Do the filtering
-        return this.doPatternFiltering(frame, value);
-    }
-
-    /**
-     * Execute the property link with the un-cached path.
-     *
-     * @param frame The frame to execute the link in.
-     * @param node The node get the property from.
-     * @return The result of the link.
-     */
-    @Specialization(replaces = "propertyCached")
-    protected Libadalang.AdaNode[] propertyUncached(VirtualFrame frame, Libadalang.AdaNode node) {
-        // Get the property methods
-        LKQLProperty property = new LKQLProperty(this.propertyName, node);
-
-        // Test if the property is valid
-        if (property.getDescription() == null) {
-            throw LKQLRuntimeException.noSuchField(this);
-        }
-
-        // Return the result
-        return this.propertyCached(frame, node, property);
-    }
-
-    // ----- Override methods -----
-
-    /**
-     * @see com.adacore.lkql_jit.nodes.LKQLNode#toString(int)
-     */
-    @Override
-    public String toString(int indentLevel) {
-        return this.nodeRepresentation(
-                indentLevel, new String[] {"propertyName"}, new Object[] {this.propertyName});
-    }
-}
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/ExtendedNodePattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/ExtendedNodePattern.java
index 939e0bb94..a7702879a 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/ExtendedNodePattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/ExtendedNodePattern.java
@@ -22,8 +22,10 @@
 
 package com.adacore.lkql_jit.nodes.patterns.node_patterns;
 
-import com.adacore.libadalang.Libadalang;
+import com.adacore.lkql_jit.LKQLTypeSystemGen;
+import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.nodes.patterns.ValuePattern;
+import com.adacore.lkql_jit.utils.LKQLTypesHelper;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.frame.VirtualFrame;
 
@@ -63,21 +65,26 @@ public ExtendedNodePattern(
     // ----- Execution methods -----
 
     /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
+     * @see com.adacore.lkql_jit.nodes.patterns.BasePattern#executeValue(VirtualFrame, Object)
      */
     @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
+    public boolean executeValue(VirtualFrame frame, Object value) {
         // Test the base pattern
-        if (this.basePattern.executeNode(frame, node)) {
-            // Verify all details
-            for (NodePatternDetail detail : this.details) {
-                if (!detail.executeDetail(frame, node)) return false;
-            }
+        if (this.basePattern.executeValue(frame, value)) {
+            if (LKQLTypeSystemGen.isAdaNode(value)) {
+                var node = LKQLTypeSystemGen.asAdaNode(value);
+
+                // Verify all details
+                for (NodePatternDetail detail : this.details) {
+                    if (!detail.executeDetail(frame, node)) return false;
+                }
 
-            // Return the success
-            return true;
+                // Return the success
+                return true;
+            } else {
+                throw LKQLRuntimeException.wrongType(
+                        LKQLTypesHelper.ADA_NODE, LKQLTypesHelper.fromJava(value), this);
+            }
         }
 
         // Return the failure
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodeKindPattern.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodeKindPattern.java
index 800aebf41..6b183064b 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodeKindPattern.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodeKindPattern.java
@@ -59,13 +59,11 @@ public NodeKindPattern(SourceLocation location, String kindName) {
     // ----- Execution methods -----
 
     /**
-     * @see
-     *     com.adacore.lkql_jit.nodes.patterns.BasePattern#executeNode(com.oracle.truffle.api.frame.VirtualFrame,
-     *     com.adacore.libadalang.Libadalang.AdaNode)
+     * @see com.adacore.lkql_jit.nodes.patterns.BasePattern#executeValue(VirtualFrame, Object)
      */
     @Override
-    public boolean executeNode(VirtualFrame frame, Libadalang.AdaNode node) {
-        return this.nodeClazz.isInstance(node) && node != LKQLNull.INSTANCE;
+    public boolean executeValue(VirtualFrame frame, Object value) {
+        return this.nodeClazz.isInstance(value) && value != LKQLNull.INSTANCE;
     }
 
     // ----- Override methods -----
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodePatternField.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodePatternField.java
index 0e81f6daa..5bb1e18aa 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodePatternField.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodePatternField.java
@@ -25,6 +25,7 @@
 import com.adacore.libadalang.Libadalang;
 import com.adacore.lkql_jit.built_ins.values.LKQLProperty;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
+import com.adacore.lkql_jit.nodes.patterns.BasePattern;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -47,7 +48,7 @@ public abstract class NodePatternField extends NodePatternDetail {
     /** The expected value for the field. */
     @Child
     @SuppressWarnings("FieldMayBeFinal")
-    protected DetailValue expected;
+    protected BasePattern expected;
 
     // ----- Constructors -----
 
@@ -58,7 +59,7 @@ public abstract class NodePatternField extends NodePatternDetail {
      * @param fieldName The name of the field to get.
      * @param expected The expected value for the field.
      */
-    protected NodePatternField(SourceLocation location, String fieldName, DetailValue expected) {
+    protected NodePatternField(SourceLocation location, String fieldName, BasePattern expected) {
         super(location);
         this.fieldName = fieldName;
         this.expected = expected;
@@ -83,7 +84,7 @@ protected boolean fieldCached(
         Object value = property.executeAsField(this);
 
         // Verify if the detail value match
-        return this.expected.executeDetailValue(frame, value);
+        return this.expected.executeValue(frame, value);
     }
 
     /**
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodePatternProperty.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodePatternProperty.java
index d62cf3fbc..fab7d76ee 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodePatternProperty.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/patterns/node_patterns/NodePatternProperty.java
@@ -26,6 +26,7 @@
 import com.adacore.lkql_jit.built_ins.values.LKQLProperty;
 import com.adacore.lkql_jit.exception.LKQLRuntimeException;
 import com.adacore.lkql_jit.nodes.arguments.ArgList;
+import com.adacore.lkql_jit.nodes.patterns.BasePattern;
 import com.adacore.lkql_jit.utils.source_location.SourceLocation;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Specialization;
@@ -53,7 +54,7 @@ public abstract class NodePatternProperty extends NodePatternDetail {
     /** The expected value for the property call. */
     @Child
     @SuppressWarnings("FieldMayBeFinal")
-    protected DetailValue expected;
+    protected BasePattern expected;
 
     // ----- Constructors -----
 
@@ -66,7 +67,7 @@ public abstract class NodePatternProperty extends NodePatternDetail {
      * @param expected The expected value of the property call.
      */
     public NodePatternProperty(
-            SourceLocation location, String propertyName, ArgList argList, DetailValue expected) {
+            SourceLocation location, String propertyName, ArgList argList, BasePattern expected) {
         super(location);
         this.propertyName = propertyName;
         this.argList = argList;
@@ -98,7 +99,7 @@ protected boolean propertyCached(
         Object value = property.executeAsProperty(this, this.argList, arguments);
 
         // Verify the pattern
-        return this.expected.executeDetailValue(frame, value);
+        return this.expected.executeValue(frame, value);
     }
 
     /**
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/SelectorRootNode.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/SelectorRootNode.java
index 6a3a53251..6787956ce 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/SelectorRootNode.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/nodes/root_nodes/SelectorRootNode.java
@@ -22,7 +22,7 @@
 
 package com.adacore.lkql_jit.nodes.root_nodes;
 
-import com.adacore.lkql_jit.built_ins.values.LKQLDepthNode;
+import com.adacore.lkql_jit.built_ins.values.LKQLDepthValue;
 import com.adacore.lkql_jit.built_ins.values.LKQLUnit;
 import com.adacore.lkql_jit.nodes.declarations.selector.SelectorArm;
 import com.adacore.lkql_jit.nodes.declarations.selector.SelectorExpr;
@@ -37,7 +37,7 @@
  * @author Hugo GUERRIER
  */
 public final class SelectorRootNode
-        extends MemoizedRootNode<LKQLDepthNode, SelectorRootNode.SelectorCallResult> {
+        extends MemoizedRootNode<LKQLDepthValue, SelectorRootNode.SelectorCallResult> {
 
     // ----- Attributes -----
 
@@ -96,16 +96,16 @@ public Object execute(VirtualFrame frame) {
         this.initFrame(frame);
 
         // Get the node and set it into the frame
-        LKQLDepthNode node = (LKQLDepthNode) frame.getArguments()[1];
+        LKQLDepthValue value = (LKQLDepthValue) frame.getArguments()[1];
 
         // Try memoization
         if (this.isMemoized) {
-            if (this.isMemoized(node)) return this.getMemoized(node);
+            if (this.isMemoized(value)) return this.getMemoized(value);
         }
 
         if (this.thisSlot > -1 && this.depthSlot > -1) {
-            FrameUtils.writeLocal(frame, this.thisSlot, node);
-            FrameUtils.writeLocal(frame, this.depthSlot, ((Integer) node.getDepth()).longValue());
+            FrameUtils.writeLocal(frame, this.thisSlot, value.value);
+            FrameUtils.writeLocal(frame, this.depthSlot, ((Integer) value.depth).longValue());
         }
 
         // Prepare the result
@@ -113,7 +113,7 @@ public Object execute(VirtualFrame frame) {
 
         // Try to match an arm, if there is none, set the result to unit
         for (SelectorArm arm : this.arms) {
-            res = arm.executeArm(frame, node);
+            res = arm.executeArm(frame, value);
             if (res != null) break;
         }
         if (res == null) {
@@ -122,7 +122,7 @@ public Object execute(VirtualFrame frame) {
 
         // Do the memoization cache addition
         if (this.isMemoized) {
-            this.putMemoized(node, res);
+            this.putMemoized(value, res);
         }
 
         // Return the result
diff --git a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/CheckerUtils.java b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/CheckerUtils.java
index 3f47f89bd..b29f401eb 100644
--- a/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/CheckerUtils.java
+++ b/lkql_jit/language/src/main/java/com/adacore/lkql_jit/utils/functions/CheckerUtils.java
@@ -100,7 +100,6 @@ void emitMissingFile(
          * @param unit The analysis unit in which the error occurred.
          * @param adaLocation The location in the unit of the error.
          * @param errorLocation The location in the LKQL code which rose the exception.
-         * @param errorName The name of the error.
          * @param errorMessage The message of the error.
          * @param context The context to output the message.
          */
@@ -109,7 +108,6 @@ void emitInternalError(
                 Libadalang.AnalysisUnit unit,
                 Libadalang.SourceLocation adaLocation,
                 String errorLocation,
-                String errorName,
                 String errorMessage,
                 LKQLContext context);
     }
@@ -155,13 +153,12 @@ public void emitInternalError(
                 final Libadalang.AnalysisUnit unit,
                 final Libadalang.SourceLocation adaLocation,
                 final String errorLocation,
-                final String errorName,
                 final String errorMessage,
                 final LKQLContext context) {
             context.println(
                     unit.getFileName(false)
-                            + ":1:01: internal error: "
-                            + errorName
+                            + ":"
+                            + adaLocation.toString()
                             + ":"
                             + errorLocation
                             + ": "
@@ -293,7 +290,6 @@ public void emitInternalError(
                 final Libadalang.AnalysisUnit unit,
                 final Libadalang.SourceLocation adaLocation,
                 final String errorLocation,
-                final String errorName,
                 final String errorMessage,
                 final LKQLContext context) {
             context.println(
@@ -306,9 +302,6 @@ public void emitInternalError(
                             + "internal error at "
                             + errorLocation
                             + ": "
-                            + "raised "
-                            + errorName
-                            + " : "
                             + errorMessage
                             + " ["
                             + ruleName.toLowerCase()
diff --git a/lkql_jit/lkql_cli/src/main/java/com/adacore/lkql_jit/LKQLLauncher.java b/lkql_jit/lkql_cli/src/main/java/com/adacore/lkql_jit/LKQLLauncher.java
index 8704f422a..8d7586f5e 100644
--- a/lkql_jit/lkql_cli/src/main/java/com/adacore/lkql_jit/LKQLLauncher.java
+++ b/lkql_jit/lkql_cli/src/main/java/com/adacore/lkql_jit/LKQLLauncher.java
@@ -232,6 +232,8 @@ protected int executeScript(Context.Builder contextBuilder) {
                         // Ignore
                     } catch (EndOfFileException e) {
                         return 12;
+                    } catch (Exception e) {
+                        System.err.println(e.getMessage());
                     }
                 }
             }
diff --git a/testsuite/tests/gnatcheck_errors/lkql_error/test.out b/testsuite/tests/gnatcheck_errors/lkql_error/test.out
index 0f724cc99..70492b547 100644
--- a/testsuite/tests/gnatcheck_errors/lkql_error/test.out
+++ b/testsuite/tests/gnatcheck_errors/lkql_error/test.out
@@ -32,14 +32,14 @@ Total gnatcheck failures: 9
 
 6. Gnatcheck internal errors
 
-main.adb:1:01: internal error at foo.lkql:4:17: raised LKQL.ERRORS.STOP_EVALUATION_ERROR : Null receiver in dot access
-main.adb:1:01: internal error at foo_unit.lkql:4:22: raised LKQL.ERRORS.STOP_EVALUATION_ERROR : Null receiver in dot access
-main.adb:1:11: internal error at foo.lkql:4:17: raised LKQL.ERRORS.STOP_EVALUATION_ERROR : Null receiver in dot access
-main.adb:1:18: internal error at foo.lkql:4:17: raised LKQL.ERRORS.STOP_EVALUATION_ERROR : Null receiver in dot access
-main.adb:2:06: internal error at foo.lkql:4:17: raised LKQL.ERRORS.STOP_EVALUATION_ERROR : Null receiver in dot access
-main.adb:3:04: internal error at foo.lkql:4:17: raised LKQL.ERRORS.STOP_EVALUATION_ERROR : Null receiver in dot access
-main.adb:3:08: internal error at foo.lkql:4:17: raised LKQL.ERRORS.STOP_EVALUATION_ERROR : Null receiver in dot access
-main.adb:4:05: internal error at foo.lkql:4:17: raised LKQL.ERRORS.STOP_EVALUATION_ERROR : Null receiver in dot access
-main.adb:4:10: internal error at foo.lkql:4:17: raised LKQL.ERRORS.STOP_EVALUATION_ERROR : Null receiver in dot access
+main.adb:1:01: internal error at foo.lkql:4:17: Null receiver in dot access
+main.adb:1:01: internal error at foo_unit.lkql:4:22: Null receiver in dot access
+main.adb:1:11: internal error at foo.lkql:4:17: Null receiver in dot access
+main.adb:1:18: internal error at foo.lkql:4:17: Null receiver in dot access
+main.adb:2:06: internal error at foo.lkql:4:17: Null receiver in dot access
+main.adb:3:04: internal error at foo.lkql:4:17: Null receiver in dot access
+main.adb:3:08: internal error at foo.lkql:4:17: Null receiver in dot access
+main.adb:4:05: internal error at foo.lkql:4:17: Null receiver in dot access
+main.adb:4:10: internal error at foo.lkql:4:17: Null receiver in dot access
 
 >>>program returned status code 2
diff --git a/testsuite/tests/interop/selector_list/Main.java b/testsuite/tests/interop/selector_list/Main.java
deleted file mode 100644
index 89df22bfb..000000000
--- a/testsuite/tests/interop/selector_list/Main.java
+++ /dev/null
@@ -1,33 +0,0 @@
-import org.graalvm.polyglot.Context;
-import org.graalvm.polyglot.Value;
-
-public class Main {
-    private static final String LKQL_SOURCE =
-        """
-        val nodes = children(units()[1].root)
-        """;
-
-    private static void print(String messageName, Object value) {
-        System.out.println("  " + messageName + ": " + value);
-    }
-
-    public static void main(String[] args) {
-        Context context = Context.newBuilder("lkql")
-                                 .option("lkql.projectFile", "default_project/default.gpr")
-                                 .build();
-        Value executable = context.parse("lkql", LKQL_SOURCE);
-
-        Value namespace = executable.execute(false);
-        Value nodes = namespace.getMember("nodes");
-        System.out.println("=== Selector list interop messages:");
-        print("toString()", nodes.toString());
-        print("hasArrayElements()", nodes.hasArrayElements());
-        print("getArraySize()", nodes.getArraySize());
-        print("isBoolean()", nodes.isBoolean());
-        print("asBoolean()", nodes.asBoolean());
-        print("getArrayElement(0)", nodes.getArrayElement(0));
-        print("getArrayElement(1)", nodes.getArrayElement(1));
-        print("getArrayElement(2)", nodes.getArrayElement(2));
-        print("hasIterator()", nodes.hasIterator());
-    }
-}
diff --git a/testsuite/tests/interop/selector_list/test.out b/testsuite/tests/interop/selector_list/test.out
deleted file mode 100644
index e9eeb3f00..000000000
--- a/testsuite/tests/interop/selector_list/test.out
+++ /dev/null
@@ -1,10 +0,0 @@
-=== Selector list interop messages:
-  toString(): [<AdaNodeList main.adb:1:1-1:35>, <LibraryItem main.adb:3:1-8:10>, <PragmaNodeList main.adb:8:10-8:10>, <WithClause main.adb:1:1-1:18>, <UsePackageClause main.adb:1:19-1:35>, <PrivateAbsent main.adb:1:35-1:35>, <SubpBody ["Main"] main.adb:3:1-8:10>, <LimitedAbsent main.adb:1:1-1:1>, <PrivateAbsent main.adb:1:1-1:1>, <NameList main.adb:1:6-1:17>, <NameList main.adb:1:23-1:34>, <OverridingUnspecified main.adb:1:35-1:35>, <SubpSpec main.adb:3:1-3:15>, <DeclarativePart main.adb:3:18-6:1>, <HandledStmts main.adb:6:6-8:1>, <EndName main.adb:8:5-8:9>, <DottedName main.adb:1:6-1:17>, <DottedName main.adb:1:23-1:34>, <SubpKindProcedure main.adb:3:1-3:10>, <DefiningName "Main" main.adb:3:11-3:15>, <AdaNodeList main.adb:4:4-5:66>, <StmtList main.adb:7:4-7:23>, <AdaNodeList main.adb:7:22-7:22>, <Id "Main" main.adb:8:5-8:9>, <Id "Ada" main.adb:1:6-1:9>, <Id "Text_IO" main.adb:1:10-1:17>, <Id "Ada" main.adb:1:23-1:26>, <Id "Text_IO" main.adb:1:27-1:34>, <Id "Main" main.adb:3:11-3:15>, <ObjectDecl ["Message"] main.adb:4:4-4:48>, <ObjectDecl ["ConstantMessage"] main.adb:5:4-5:66>, <CallStmt main.adb:7:4-7:23>, <DefiningNameList main.adb:4:4-4:11>, <AliasedAbsent main.adb:4:21-4:21>, <ConstantAbsent main.adb:4:21-4:21>, <ModeDefault main.adb:4:21-4:21>, <SubtypeIndication main.adb:4:22-4:28>, <Str ""Hello World !"" main.adb:4:32-4:47>, <DefiningNameList main.adb:5:4-5:19>, <AliasedAbsent main.adb:5:21-5:21>, <ConstantPresent main.adb:5:22-5:30>, <ModeDefault main.adb:5:30-5:30>, <SubtypeIndication main.adb:5:31-5:37>, <Str ""Hello Constant world !"" main.adb:5:41-5:65>, <CallExpr main.adb:7:4-7:22>, <DefiningName "Message" main.adb:4:4-4:11>, <NotNullAbsent main.adb:4:21-4:21>, <Id "String" main.adb:4:22-4:28>, <DefiningName "ConstantMessage" main.adb:5:4-5:19>, <NotNullAbsent main.adb:5:30-5:30>, <Id "String" main.adb:5:31-5:37>, <Id "Put_Line" main.adb:7:4-7:12>, <AssocList main.adb:7:14-7:21>, <Id "Message" main.adb:4:4-4:11>, <Id "ConstantMessage" main.adb:5:4-5:19>, <ParamAssoc main.adb:7:14-7:21>, <Id "Message" main.adb:7:14-7:21>]
-  hasArrayElements(): true
-  getArraySize(): 57
-  isBoolean(): true
-  asBoolean(): true
-  getArrayElement(0): <AdaNodeList main.adb:1:1-1:35>
-  getArrayElement(1): <LibraryItem main.adb:3:1-8:10>
-  getArrayElement(2): <PragmaNodeList main.adb:8:10-8:10>
-  hasIterator(): true
diff --git a/testsuite/tests/interop/selector_list/test.yaml b/testsuite/tests/interop/selector_list/test.yaml
deleted file mode 100644
index 33f2e79ec..000000000
--- a/testsuite/tests/interop/selector_list/test.yaml
+++ /dev/null
@@ -1 +0,0 @@
-driver: java
\ No newline at end of file
diff --git a/testsuite/tests/interpreter/bool_pattern/script.lkql b/testsuite/tests/interpreter/bool_pattern/script.lkql
new file mode 100644
index 000000000..498f6f36b
--- /dev/null
+++ b/testsuite/tests/interpreter/bool_pattern/script.lkql
@@ -0,0 +1,9 @@
+fun test_match(a) =
+    match a
+      | false => print("woop")
+      | true => print("doop")
+      | * => print("other")
+
+test_match(false)
+test_match(true)
+test_match("lol")
diff --git a/testsuite/tests/interpreter/bool_pattern/test.out b/testsuite/tests/interpreter/bool_pattern/test.out
new file mode 100644
index 000000000..1b5d11381
--- /dev/null
+++ b/testsuite/tests/interpreter/bool_pattern/test.out
@@ -0,0 +1,3 @@
+woop
+doop
+other
diff --git a/testsuite/tests/interpreter/bool_pattern/test.yaml b/testsuite/tests/interpreter/bool_pattern/test.yaml
new file mode 100644
index 000000000..49c7ba4bb
--- /dev/null
+++ b/testsuite/tests/interpreter/bool_pattern/test.yaml
@@ -0,0 +1,2 @@
+driver: 'interpreter'
+project: 'kp_R517_023_simple_test/prj.gpr'
diff --git a/testsuite/tests/interpreter/chained_query_dotted_name/script.lkql b/testsuite/tests/interpreter/chained_query_dotted_name/script.lkql
deleted file mode 100644
index f9002201f..000000000
--- a/testsuite/tests/interpreter/chained_query_dotted_name/script.lkql
+++ /dev/null
@@ -1,4 +0,0 @@
-val inDottedInWith =
-    select a @ AspectSpec any children is DottedName
-                         any children is Identifier
-print(inDottedInWith)
\ No newline at end of file
diff --git a/testsuite/tests/interpreter/chained_query_dotted_name/test.out b/testsuite/tests/interpreter/chained_query_dotted_name/test.out
deleted file mode 100644
index ddb2b340c..000000000
--- a/testsuite/tests/interpreter/chained_query_dotted_name/test.out
+++ /dev/null
@@ -1 +0,0 @@
-[<Id "to_Address" aspect_decls.ads:5:49-5:59>, <Id "System" aspect_decls.ads:5:25-5:31>, <Id "Storage_Elements" aspect_decls.ads:5:32-5:48>]
diff --git a/testsuite/tests/interpreter/chained_query_dotted_name/test.yaml b/testsuite/tests/interpreter/chained_query_dotted_name/test.yaml
deleted file mode 100644
index 0c46d8ed4..000000000
--- a/testsuite/tests/interpreter/chained_query_dotted_name/test.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-driver: 'interpreter'
-project: 'aspect_decls/aspect_decls.gpr'
diff --git a/testsuite/tests/interpreter/chained_query_field/script.lkql b/testsuite/tests/interpreter/chained_query_field/script.lkql
deleted file mode 100644
index 438958f25..000000000
--- a/testsuite/tests/interpreter/chained_query_field/script.lkql
+++ /dev/null
@@ -1,6 +0,0 @@
-val inDottedInWith =
-    select t @ TypeDecl.children is d @ DefiningName when {
-        val x = print(t);
-        val y = print(d);
-        true
-    }
diff --git a/testsuite/tests/interpreter/chained_query_field/test.out b/testsuite/tests/interpreter/chained_query_field/test.out
deleted file mode 100644
index 0ba011217..000000000
--- a/testsuite/tests/interpreter/chained_query_field/test.out
+++ /dev/null
@@ -1,4 +0,0 @@
-<ConcreteTypeDecl ["Int_Access"] src.ads:3:5-3:43>
-<DefiningName "Int_Access" src.ads:3:10-3:20>
-<ConcreteTypeDecl ["Volt"] src.ads:5:5-5:49>
-<DefiningName "Volt" src.ads:5:10-5:14>
diff --git a/testsuite/tests/interpreter/chained_query_field/test.yaml b/testsuite/tests/interpreter/chained_query_field/test.yaml
deleted file mode 100644
index e787a4fa0..000000000
--- a/testsuite/tests/interpreter/chained_query_field/test.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-driver: 'interpreter'
-project: 'access_decls/access_decls.gpr'
diff --git a/testsuite/tests/interpreter/int_pattern/script.lkql b/testsuite/tests/interpreter/int_pattern/script.lkql
new file mode 100644
index 000000000..b318cf138
--- /dev/null
+++ b/testsuite/tests/interpreter/int_pattern/script.lkql
@@ -0,0 +1,11 @@
+fun test_match_int(i) =
+    match i
+    | 1 => print("un")
+    | 2 => print("dos")
+    | 3 => print("tres")
+    | * => print("un pasito adelante maria")
+
+test_match_int(1)
+test_match_int(2)
+test_match_int(3)
+test_match_int(null)
diff --git a/testsuite/tests/interpreter/int_pattern/test.out b/testsuite/tests/interpreter/int_pattern/test.out
new file mode 100644
index 000000000..34009622c
--- /dev/null
+++ b/testsuite/tests/interpreter/int_pattern/test.out
@@ -0,0 +1,4 @@
+un
+dos
+tres
+un pasito adelante maria
diff --git a/testsuite/tests/interpreter/int_pattern/test.yaml b/testsuite/tests/interpreter/int_pattern/test.yaml
new file mode 100644
index 000000000..49c7ba4bb
--- /dev/null
+++ b/testsuite/tests/interpreter/int_pattern/test.yaml
@@ -0,0 +1,2 @@
+driver: 'interpreter'
+project: 'kp_R517_023_simple_test/prj.gpr'
diff --git a/testsuite/tests/interpreter/list_pattern/script.lkql b/testsuite/tests/interpreter/list_pattern/script.lkql
new file mode 100644
index 000000000..9e8eda006
--- /dev/null
+++ b/testsuite/tests/interpreter/list_pattern/script.lkql
@@ -0,0 +1,22 @@
+fun test_list_patterns(lst) =
+    print(
+        img(lst) & " matches " &
+        match lst
+        | [1, 2, 3] => "[1, 2, 3]"
+        | [1, a@*, 3] => "[1, a@*, 3], with a = " & img(a)
+        | [11, 12, ...] => "[11, 12, ...]"
+        | [1, b@*, c@...] => "[1, b@*, c@...] with b = " & img(b) & " & c = " & img(c)
+        | [...] => "[...]"
+        | [..., 1, 2] => "Can never match"
+        | * => "*"
+    )
+
+test_list_patterns([1, 2, 3])
+test_list_patterns([1, 8, 3])
+test_list_patterns([11, 12, 80])
+test_list_patterns([11, 12, 80, 81, 82])
+test_list_patterns([11, 12])
+test_list_patterns([1, 20, 21, 22])
+test_list_patterns([])
+test_list_patterns(["lol"])
+test_list_patterns({})
diff --git a/testsuite/tests/interpreter/list_pattern/test.out b/testsuite/tests/interpreter/list_pattern/test.out
new file mode 100644
index 000000000..fc839b8aa
--- /dev/null
+++ b/testsuite/tests/interpreter/list_pattern/test.out
@@ -0,0 +1,9 @@
+[1, 2, 3] matches [1, 2, 3]
+[1, 8, 3] matches [1, a@*, 3], with a = 8
+[11, 12, 80] matches [11, 12, ...]
+[11, 12, 80, 81, 82] matches [11, 12, ...]
+[11, 12] matches [11, 12, ...]
+[1, 20, 21, 22] matches [1, b@*, c@...] with b = 20 & c = [21, 22]
+[] matches [...]
+["lol"] matches [...]
+{} matches *
diff --git a/testsuite/tests/interpreter/list_pattern/test.yaml b/testsuite/tests/interpreter/list_pattern/test.yaml
new file mode 100644
index 000000000..49c7ba4bb
--- /dev/null
+++ b/testsuite/tests/interpreter/list_pattern/test.yaml
@@ -0,0 +1,2 @@
+driver: 'interpreter'
+project: 'kp_R517_023_simple_test/prj.gpr'
diff --git a/testsuite/tests/interpreter/tuple_pattern/script.lkql b/testsuite/tests/interpreter/tuple_pattern/script.lkql
new file mode 100644
index 000000000..8d8f6a5c5
--- /dev/null
+++ b/testsuite/tests/interpreter/tuple_pattern/script.lkql
@@ -0,0 +1,13 @@
+fun test_match_tuple(i) =
+    match i
+    | (1, 2, 3) => print("un, dos, tres")
+    | * => print("un pasito adelante maria")
+
+fun test_match_tuple_2(i) =
+    match i
+    | (1, a@*, b@*, 4) => { print(a); print(b) }
+
+test_match_tuple((1, 2, 3))
+test_match_tuple((4, 5, 6))
+test_match_tuple_2((1, 2, 3, 4))
+test_match_tuple_2((1, 22, 33, 4))
diff --git a/testsuite/tests/interpreter/tuple_pattern/test.out b/testsuite/tests/interpreter/tuple_pattern/test.out
new file mode 100644
index 000000000..b240fd0e8
--- /dev/null
+++ b/testsuite/tests/interpreter/tuple_pattern/test.out
@@ -0,0 +1,6 @@
+un, dos, tres
+un pasito adelante maria
+2
+3
+22
+33
diff --git a/testsuite/tests/interpreter/tuple_pattern/test.yaml b/testsuite/tests/interpreter/tuple_pattern/test.yaml
new file mode 100644
index 000000000..49c7ba4bb
--- /dev/null
+++ b/testsuite/tests/interpreter/tuple_pattern/test.yaml
@@ -0,0 +1,2 @@
+driver: 'interpreter'
+project: 'kp_R517_023_simple_test/prj.gpr'
diff --git a/testsuite/tests/interpreter_errors/match_bigint/script.lkql b/testsuite/tests/interpreter_errors/match_bigint/script.lkql
new file mode 100644
index 000000000..e3e8cf0cd
--- /dev/null
+++ b/testsuite/tests/interpreter_errors/match_bigint/script.lkql
@@ -0,0 +1,3 @@
+match 12
+| 124891249249124182481248 => true
+| * => false
diff --git a/testsuite/tests/interpreter_errors/match_bigint/test.out b/testsuite/tests/interpreter_errors/match_bigint/test.out
new file mode 100644
index 000000000..aad95e39e
--- /dev/null
+++ b/testsuite/tests/interpreter_errors/match_bigint/test.out
@@ -0,0 +1,4 @@
+script.lkql:2:3: error: Invalid number literal for pattern
+2 | | 124891249249124182481248 => true
+  |   ^^^^^^^^^^^^^^^^^^^^^^^^
+
diff --git a/testsuite/tests/interpreter_errors/match_bigint/test.yaml b/testsuite/tests/interpreter_errors/match_bigint/test.yaml
new file mode 100644
index 000000000..c5e30112e
--- /dev/null
+++ b/testsuite/tests/interpreter_errors/match_bigint/test.yaml
@@ -0,0 +1,2 @@
+driver: 'interpreter'
+project: 'default_project/default.gpr'
diff --git a/testsuite/tests/parser/chained_query_pattern/input b/testsuite/tests/parser/chained_query_pattern/input
deleted file mode 100644
index 6c366fd3b..000000000
--- a/testsuite/tests/parser/chained_query_pattern/input
+++ /dev/null
@@ -1,2 +0,0 @@
-select k @ KindOne.property() is KindTwo all sel is l @ KindThree.field is KindFour
-    when k.prop() and l.prop()
diff --git a/testsuite/tests/parser/chained_query_pattern/test.out b/testsuite/tests/parser/chained_query_pattern/test.out
deleted file mode 100644
index e1e7da8cb..000000000
--- a/testsuite/tests/parser/chained_query_pattern/test.out
+++ /dev/null
@@ -1,83 +0,0 @@
-Query
-|f_from_expr: <null>
-|f_through_expr: <null>
-|f_query_kind:
-|  QueryKindAll
-|f_pattern:
-|  ChainedNodePattern
-|  |f_first_pattern:
-|  |  BindingPattern
-|  |  |f_binding:
-|  |  |  Identifier: k
-|  |  |f_value_pattern:
-|  |  |  NodeKindPattern
-|  |  |  |f_kind_name:
-|  |  |  |  Identifier: KindOne
-|  |f_chain:
-|  |  ChainedPatternLinkList
-|  |  |  PropertyLink
-|  |  |  |f_property:
-|  |  |  |  FunCall
-|  |  |  |  |f_name:
-|  |  |  |  |  Identifier: property
-|  |  |  |  |f_has_safe:
-|  |  |  |  |  SafeAbsent
-|  |  |  |  |f_arguments:
-|  |  |  |  |  ArgList: <empty list>
-|  |  |  |f_pattern:
-|  |  |  |  NodeKindPattern
-|  |  |  |  |f_kind_name:
-|  |  |  |  |  Identifier: KindTwo
-|  |  |  SelectorLink
-|  |  |  |f_selector:
-|  |  |  |  SelectorCall
-|  |  |  |  |f_quantifier:
-|  |  |  |  |  Identifier: all
-|  |  |  |  |f_binding: <null>
-|  |  |  |  |f_selector_call:
-|  |  |  |  |  Identifier: sel
-|  |  |  |f_pattern:
-|  |  |  |  BindingPattern
-|  |  |  |  |f_binding:
-|  |  |  |  |  Identifier: l
-|  |  |  |  |f_value_pattern:
-|  |  |  |  |  NodeKindPattern
-|  |  |  |  |  |f_kind_name:
-|  |  |  |  |  |  Identifier: KindThree
-|  |  |  FieldLink
-|  |  |  |f_field:
-|  |  |  |  Identifier: field
-|  |  |  |f_pattern:
-|  |  |  |  FilteredPattern
-|  |  |  |  |f_pattern:
-|  |  |  |  |  NodeKindPattern
-|  |  |  |  |  |f_kind_name:
-|  |  |  |  |  |  Identifier: KindFour
-|  |  |  |  |f_predicate:
-|  |  |  |  |  BinOp
-|  |  |  |  |  |f_left:
-|  |  |  |  |  |  FunCall
-|  |  |  |  |  |  |f_name:
-|  |  |  |  |  |  |  DotAccess
-|  |  |  |  |  |  |  |f_receiver:
-|  |  |  |  |  |  |  |  Identifier: k
-|  |  |  |  |  |  |  |f_member:
-|  |  |  |  |  |  |  |  Identifier: prop
-|  |  |  |  |  |  |f_has_safe:
-|  |  |  |  |  |  |  SafeAbsent
-|  |  |  |  |  |  |f_arguments:
-|  |  |  |  |  |  |  ArgList: <empty list>
-|  |  |  |  |  |f_op:
-|  |  |  |  |  |  OpAnd
-|  |  |  |  |  |f_right:
-|  |  |  |  |  |  FunCall
-|  |  |  |  |  |  |f_name:
-|  |  |  |  |  |  |  DotAccess
-|  |  |  |  |  |  |  |f_receiver:
-|  |  |  |  |  |  |  |  Identifier: l
-|  |  |  |  |  |  |  |f_member:
-|  |  |  |  |  |  |  |  Identifier: prop
-|  |  |  |  |  |  |f_has_safe:
-|  |  |  |  |  |  |  SafeAbsent
-|  |  |  |  |  |  |f_arguments:
-|  |  |  |  |  |  |  ArgList: <empty list>
diff --git a/testsuite/tests/parser/chained_query_pattern/test.yaml b/testsuite/tests/parser/chained_query_pattern/test.yaml
deleted file mode 100644
index 563a6a37f..000000000
--- a/testsuite/tests/parser/chained_query_pattern/test.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-driver: parser
-rule: expr
diff --git a/testsuite/tests/parser/fun_with_type_annotations/input b/testsuite/tests/parser/fun_with_type_annotations/input
index cb012e575..545776006 100644
--- a/testsuite/tests/parser/fun_with_type_annotations/input
+++ b/testsuite/tests/parser/fun_with_type_annotations/input
@@ -2,10 +2,10 @@
 fun too_many_dependencies(max_deps : int) =
     select
         CompilationUnit(
-            any c @ children is Identifier(any parent(depth=2) is WithClause)
+            any c @ children is Identifier(any parent(depth=2) is WithClause),
+            f_body is l @ LibraryItem when {
+                val semanticParent = l.f_item?.p_semantic_parent();
+                val deps = [x for x in c if x.p_referenced_decl() != semanticParent];
+                deps.length > max_deps
+            }
         )
-        .f_body is l @ LibraryItem when {
-            val semanticParent = l.f_item?.p_semantic_parent();
-            val deps = [x for x in c if x.p_referenced_decl() != semanticParent];
-            deps.length > max_deps
-        }
diff --git a/testsuite/tests/parser/fun_with_type_annotations/test.out b/testsuite/tests/parser/fun_with_type_annotations/test.out
index 05fe6f8ea..9fcb4f161 100644
--- a/testsuite/tests/parser/fun_with_type_annotations/test.out
+++ b/testsuite/tests/parser/fun_with_type_annotations/test.out
@@ -26,61 +26,57 @@ FunDecl
 |  |  |f_query_kind:
 |  |  |  QueryKindAll
 |  |  |f_pattern:
-|  |  |  ChainedNodePattern
-|  |  |  |f_first_pattern:
-|  |  |  |  ExtendedNodePattern
-|  |  |  |  |f_node_pattern:
-|  |  |  |  |  NodeKindPattern
-|  |  |  |  |  |f_kind_name:
-|  |  |  |  |  |  Identifier: CompilationUnit
-|  |  |  |  |f_details:
-|  |  |  |  |  NodePatternDetailList
-|  |  |  |  |  |  NodePatternSelector
-|  |  |  |  |  |  |f_call:
-|  |  |  |  |  |  |  SelectorCall
-|  |  |  |  |  |  |  |f_quantifier:
-|  |  |  |  |  |  |  |  Identifier: any
-|  |  |  |  |  |  |  |f_binding:
-|  |  |  |  |  |  |  |  Identifier: c
-|  |  |  |  |  |  |  |f_selector_call:
-|  |  |  |  |  |  |  |  Identifier: children
-|  |  |  |  |  |  |f_pattern:
-|  |  |  |  |  |  |  ExtendedNodePattern
-|  |  |  |  |  |  |  |f_node_pattern:
-|  |  |  |  |  |  |  |  NodeKindPattern
-|  |  |  |  |  |  |  |  |f_kind_name:
-|  |  |  |  |  |  |  |  |  Identifier: Identifier
-|  |  |  |  |  |  |  |f_details:
-|  |  |  |  |  |  |  |  NodePatternDetailList
-|  |  |  |  |  |  |  |  |  NodePatternSelector
-|  |  |  |  |  |  |  |  |  |f_call:
-|  |  |  |  |  |  |  |  |  |  SelectorCall
-|  |  |  |  |  |  |  |  |  |  |f_quantifier:
-|  |  |  |  |  |  |  |  |  |  |  Identifier: any
-|  |  |  |  |  |  |  |  |  |  |f_binding: <null>
-|  |  |  |  |  |  |  |  |  |  |f_selector_call:
-|  |  |  |  |  |  |  |  |  |  |  FunCall
-|  |  |  |  |  |  |  |  |  |  |  |f_name:
-|  |  |  |  |  |  |  |  |  |  |  |  Identifier: parent
-|  |  |  |  |  |  |  |  |  |  |  |f_has_safe:
-|  |  |  |  |  |  |  |  |  |  |  |  SafeAbsent
-|  |  |  |  |  |  |  |  |  |  |  |f_arguments:
-|  |  |  |  |  |  |  |  |  |  |  |  ArgList
-|  |  |  |  |  |  |  |  |  |  |  |  |  NamedArg
-|  |  |  |  |  |  |  |  |  |  |  |  |  |f_arg_name:
-|  |  |  |  |  |  |  |  |  |  |  |  |  |  Identifier: depth
-|  |  |  |  |  |  |  |  |  |  |  |  |  |f_value_expr:
-|  |  |  |  |  |  |  |  |  |  |  |  |  |  IntegerLiteral: 2
-|  |  |  |  |  |  |  |  |  |f_pattern:
-|  |  |  |  |  |  |  |  |  |  NodeKindPattern
-|  |  |  |  |  |  |  |  |  |  |f_kind_name:
-|  |  |  |  |  |  |  |  |  |  |  Identifier: WithClause
-|  |  |  |f_chain:
-|  |  |  |  ChainedPatternLinkList
-|  |  |  |  |  FieldLink
-|  |  |  |  |  |f_field:
-|  |  |  |  |  |  Identifier: f_body
+|  |  |  ExtendedNodePattern
+|  |  |  |f_node_pattern:
+|  |  |  |  NodeKindPattern
+|  |  |  |  |f_kind_name:
+|  |  |  |  |  Identifier: CompilationUnit
+|  |  |  |f_details:
+|  |  |  |  NodePatternDetailList
+|  |  |  |  |  NodePatternSelector
+|  |  |  |  |  |f_call:
+|  |  |  |  |  |  SelectorCall
+|  |  |  |  |  |  |f_quantifier:
+|  |  |  |  |  |  |  Identifier: any
+|  |  |  |  |  |  |f_binding:
+|  |  |  |  |  |  |  Identifier: c
+|  |  |  |  |  |  |f_selector_call:
+|  |  |  |  |  |  |  Identifier: children
 |  |  |  |  |  |f_pattern:
+|  |  |  |  |  |  ExtendedNodePattern
+|  |  |  |  |  |  |f_node_pattern:
+|  |  |  |  |  |  |  NodeKindPattern
+|  |  |  |  |  |  |  |f_kind_name:
+|  |  |  |  |  |  |  |  Identifier: Identifier
+|  |  |  |  |  |  |f_details:
+|  |  |  |  |  |  |  NodePatternDetailList
+|  |  |  |  |  |  |  |  NodePatternSelector
+|  |  |  |  |  |  |  |  |f_call:
+|  |  |  |  |  |  |  |  |  SelectorCall
+|  |  |  |  |  |  |  |  |  |f_quantifier:
+|  |  |  |  |  |  |  |  |  |  Identifier: any
+|  |  |  |  |  |  |  |  |  |f_binding: <null>
+|  |  |  |  |  |  |  |  |  |f_selector_call:
+|  |  |  |  |  |  |  |  |  |  FunCall
+|  |  |  |  |  |  |  |  |  |  |f_name:
+|  |  |  |  |  |  |  |  |  |  |  Identifier: parent
+|  |  |  |  |  |  |  |  |  |  |f_has_safe:
+|  |  |  |  |  |  |  |  |  |  |  SafeAbsent
+|  |  |  |  |  |  |  |  |  |  |f_arguments:
+|  |  |  |  |  |  |  |  |  |  |  ArgList
+|  |  |  |  |  |  |  |  |  |  |  |  NamedArg
+|  |  |  |  |  |  |  |  |  |  |  |  |f_arg_name:
+|  |  |  |  |  |  |  |  |  |  |  |  |  Identifier: depth
+|  |  |  |  |  |  |  |  |  |  |  |  |f_value_expr:
+|  |  |  |  |  |  |  |  |  |  |  |  |  IntegerLiteral: 2
+|  |  |  |  |  |  |  |  |f_pattern:
+|  |  |  |  |  |  |  |  |  NodeKindPattern
+|  |  |  |  |  |  |  |  |  |f_kind_name:
+|  |  |  |  |  |  |  |  |  |  Identifier: WithClause
+|  |  |  |  |  NodePatternField
+|  |  |  |  |  |f_identifier:
+|  |  |  |  |  |  Identifier: f_body
+|  |  |  |  |  |f_expected_value:
 |  |  |  |  |  |  FilteredPattern
 |  |  |  |  |  |  |f_pattern:
 |  |  |  |  |  |  |  BindingPattern
diff --git a/testsuite/tests/parser/selector/test.out b/testsuite/tests/parser/selector/test.out
index 5d6a92dff..9013d6df5 100644
--- a/testsuite/tests/parser/selector/test.out
+++ b/testsuite/tests/parser/selector/test.out
@@ -43,11 +43,9 @@ SelectorDecl
 |  |  |  |  |  |f_identifier:
 |  |  |  |  |  |  Identifier: children
 |  |  |  |  |  |f_expected_value:
-|  |  |  |  |  |  DetailPattern
-|  |  |  |  |  |  |f_pattern_value:
-|  |  |  |  |  |  |  NodeKindPattern
-|  |  |  |  |  |  |  |f_kind_name:
-|  |  |  |  |  |  |  |  Identifier: ThirdNodeKind
+|  |  |  |  |  |  NodeKindPattern
+|  |  |  |  |  |  |f_kind_name:
+|  |  |  |  |  |  |  Identifier: ThirdNodeKind
 |  |  |f_exprs_list:
 |  |  |  SelectorExprList
 |  |  |  |  SelectorExpr
diff --git a/user_manual/generated/stdlib.rst b/user_manual/generated/stdlib.rst
index 785481f9e..5af05ff94 100644
--- a/user_manual/generated/stdlib.rst
+++ b/user_manual/generated/stdlib.rst
@@ -250,7 +250,7 @@ Selectors
 
 .. function:: component_types()
 
-    Return all the ``BaseTypeDecl``s corresponding to all fields of a given
+    Return all the ``BaseTypeDecl`` corresponding to all fields of a given
     type, including their full views, base types and subtypes.
 
 .. function:: full_parent_types()
diff --git a/user_manual/source/language_reference.rst b/user_manual/source/language_reference.rst
index 0226a5ca0..17a2ed305 100644
--- a/user_manual/source/language_reference.rst
+++ b/user_manual/source/language_reference.rst
@@ -55,8 +55,7 @@ Basic Data Types
 * Nodes: Coming from the queried language (in the common case, Ada), those are
   the only composite data types for the moment. They correspond to the syntax
   nodes of the source files being queried. They can be explored as part of the
-  general language subset, through `Field access`_, or via the `Tree
-  query language subset`_.
+  general language subset, through `Field access`_, or via the `Query language subset`_.
 
 * Patterns: Patterns are compiled regular expressions that can be used in a few
   contexts to match a string against, notably in the string built-in functions
@@ -298,10 +297,11 @@ for example.
 
 Unwrap will raise an error if the value is null.
 
-Function Call
-^^^^^^^^^^^^^
+Call
+^^^^
 
 .. lkql_doc_class:: FunCall
+.. lkql_doc_class:: SelectorCall
 .. lkql_doc_class:: Arg
 
 .. raw:: html
@@ -332,6 +332,14 @@ the callee is null:
     val fn = if true then null else add
     fn?(1, 2) # Returns null
 
+Additionally, you can also call selectors via the call syntax. Selector calls
+take only one argument, which is the starting point of the selector call chain.
+
+.. code-block:: lkql
+
+   children(select first AdaNode)
+
+
 Indexing Expression
 ^^^^^^^^^^^^^^^^^^^
 
@@ -527,9 +535,10 @@ Match Expression
 .. raw:: html
     :file: ../../lkql/build/railroad-diagrams/match.svg
 
-Pattern matching expression. Matchers will be evaluated in order against the
-match's target expression. The first matcher to match the object will trigger
-the evaluation of the associated expression in the match arm.
+This expression is a pattern matching expression, and reuses the same patterns
+as the query part of the language. Matchers will be evaluated in order against
+the match's target expression. The first matcher to match the object will
+trigger the evaluation of the associated expression in the match arm.
 
 .. code-block:: lkql
 
@@ -663,10 +672,10 @@ LKQL will search for files:
    There is no way to create hierarchies of modules for now, only flat modules
    are supported.
 
-Tree Query Language Subset
-==========================
+Query Language Subset
+=====================
 
-The tree query language subset is mainly composed of three language constructs:
+The query language subset is mainly composed of three language constructs:
 patterns, queries and selectors.
 
 Patterns allow the user to express filtering logic on trees and graphs, akin to
@@ -797,7 +806,6 @@ keyword.
 Pattern
 -------
 
-.. lkql_doc_class:: UnfilteredPattern
 .. lkql_doc_class:: ValuePattern
 
 .. raw:: html
@@ -809,45 +817,19 @@ Pattern
 .. raw:: html
     :file: ../../lkql/build/railroad-diagrams/binding_pattern.svg
 
-Patterns are by far the most complex part of the tree query language subset,
-but at its core, the concept of a pattern is very simple:
+Patterns are by far the most complex part of the query language subset, but at
+its core, the concept of a pattern is very simple:
 
 A pattern is at its core a very simple concept: it's an expression that you
-will match against a node. In the context of a query, the pattern will return a
-node or collection of nodes for each matched node. In the context of an ``is``
-comparison expression, lkql will check that the node matches the pattern, and
-produce ``true`` if it does.
-
-High Level Pattern Kinds
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-There are two kinds of top-level patterns: chained patterns and nested patterns
-(called value_patterns in the grammar), and the way they're different is in how
-you use sub-patterns. In the end they'll they differ by which nodes will be
-produced by the pattern when used in a query. Let's take an example to
-illustrate:
-
-.. code-block:: lkql
-
-   select ObjectDecl(default_expr is IntLiteral)
-
-This query uses a nested pattern, it will return every ``ObjectDecl`` that has
-an ``IntLiteral`` node in the default expression.
-
-.. code-block:: lkql
-
-   select ObjectDecl.default_expr is IntLiteral
-
-This query uses a chained pattern, it will return every ``IntLiteral`` that is
-the default expression of an ``ObjectDecl``.
+will match against a value. Lkql will check that the node matches the pattern,
+and produce ``true`` if it does. In the context of a query, that will add the
+value to the result of the query.
 
-Hence, the difference between the two kind of sub-patterns is that in the first
-case, the sub-pattern doesn't change what is returned, it only adds a filtering
-condition, whereas in the second case, the chained pattern makes the pattern
-return a sub object.
+Node patterns
+^^^^^^^^^^^^^
 
 Simple Value Patterns
-^^^^^^^^^^^^^^^^^^^^^
+"""""""""""""""""""""
 
 .. raw:: html
     :file: ../../lkql/build/railroad-diagrams/value_pattern.svg
@@ -871,7 +853,7 @@ The ``null`` pattern is a shortcut, which doesn't seem very useful in the query
 above, but is useful in nested queries.
 
 Nested Sub Patterns
-^^^^^^^^^^^^^^^^^^^
+"""""""""""""""""""
 
 .. lkql_doc_class:: NodePatternDetail
 .. lkql_doc_class:: DetailValue
@@ -927,57 +909,125 @@ this is denoted by the parentheses after the property name.
 
    select BaseId(p_referenced_decl() is ObjectDecl)
 
-Chained Sub Patterns
-^^^^^^^^^^^^^^^^^^^^
+Regular values patterns
+^^^^^^^^^^^^^^^^^^^^^^^
 
-.. lkql_doc_class:: ChainedPatternLink
-.. lkql_doc_class:: SelectorCall
+Not only nodes can be matched in LKQL: Any value can be matched via a pattern,
+including basic and composite data types.
+
+Integer pattern
+"""""""""""""""
 
-Chained sub patterns are roughly similar to nested sub patterns, and come in
-similar flavours. The big difference between the two kind of patterns, is which
-nodes are yielded when the pattern is used in a query. Chained patterns will
-yield the sub-nodes, rather than just filtering and returning the top level
-node.
+.. lkql_doc_class:: IntegerPattern
+.. raw:: html
+    :file: ../../lkql/build/railroad-diagrams/integer_pattern.svg
 
-You have the three different kind of chained patterns, corresponding to the
-nested ones.
+You can match simple integer values with this pattern
 
-Selector Chain
-""""""""""""""
+.. code-block:: lkql
+
+   v is 12
+
+Bool pattern
+""""""""""""
+
+.. lkql_doc_class:: BoolPattern
+.. raw:: html
+    :file: ../../lkql/build/railroad-diagrams/bool_pattern.svg
 
-A selector chain is a sub-pattern that allows you to recursively yield a
-sub-query via a selector call:
+You can match simple boolean values with this pattern
 
 .. code-block:: lkql
 
-   select Body any children is ForLoopStmt
+   v is true
 
-The quantifier part (``any``) can be either ``any`` or ``all``, which will
-alter how the sub-pattern matches:
+Regex pattern
+"""""""""""""
+
+.. lkql_doc_class:: RegexPattern
+.. raw:: html
+    :file: ../../lkql/build/railroad-diagrams/regex_pattern.svg
+
+You can match simple string values with this pattern, but you can also do more
+complicated matching based on regular expressions.
+
+.. code-block:: lkql
+
+   v is "hello"
+   v is "hello.*?world"
+
+Tuple pattern
+"""""""""""""
+
+.. lkql_doc_class:: TuplePattern
+.. raw:: html
+    :file: ../../lkql/build/railroad-diagrams/tuple_pattern.svg
+
+You can match tuple values with this pattern.
+
+.. code-block:: lkql
 
-Field Chain
-"""""""""""
+    match i
+    | (1, 2, 3) => print("un, dos, tres")
+    | * => print("un pasito adelante maria")
 
-A field chain is a sub-pattern that allows you to yield a specific field in the
-parent object, given that it satisfies a pattern.
+    match i
+    | (1, a@*, b@*, 4) => { print(a); print(b) }
+
+List pattern
+""""""""""""
+
+.. lkql_doc_class:: ListPattern
+.. lkql_doc_class:: SplatPattern
+
+.. raw:: html
+    :file: ../../lkql/build/railroad-diagrams/list_pattern.svg
+
+You can match list values with this pattern.
 
 .. code-block:: lkql
 
-   select ObjectDecl.f_default_expr is IntLiteral
+    match lst
+    | [1, 2, 3] => "[1, 2, 3]"
+    | [1, a@*, 3] => "[1, a@*, 3], with a = " & img(a)
+
+You can use the "splat" pattern at the end of a list pattern to match remaining
+elements:
+
+.. code-block:: lkql
 
-This will yield the default exprssions for object decls, given that those
-default expressions are int literals.
+    match lst
+    | [11, 12, ...] => "[11, 12, ...]"
+    | [1, c@...] => "[1, c@...] with b = " & img(b) & " & c = " & img(c)
+    | [...] => "Any list"
 
-Property Chain
+Object pattern
 """"""""""""""
 
-A property chain is very similar to a field chain, except that a property of
-the node is called, instead of a field accessed. Syntactically, this is denoted
-by the parentheses after the property name.
+.. lkql_doc_class:: ObjectPattern
+.. lkql_doc_class:: ObjectPatternAssoc
+.. lkql_doc_class:: SplatPattern
+
+.. raw:: html
+    :file: ../../lkql/build/railroad-diagrams/object_pattern.svg
+
+You can match object values with this pattern.
+
+.. code-block:: lkql
+
+    match obj
+     | {a: 12} => "{a: 12}"
+     | {a: a@*} => "Any object with an a key. Bind the result to a"
+
+You can use the "splat" pattern anywhere in an object pattern to match
+remaining elements:
 
 .. code-block:: lkql
 
-   select BaseId.p_referenced_decl() is ObjectDecl
+    match obj
+         | {a@..., b: "hello"} => "Bind keys that are not b to var a"
+         | {a@...} => "Bind all the object to a"
+
 
 Filtered Patterns and Binding Patterns
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^