diff --git a/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java b/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java
index 983f99711d..3a1ad53294 100644
--- a/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java
+++ b/src/main/java/net/sf/jsqlparser/parser/ASTNodeAccessImpl.java
@@ -71,22 +71,20 @@ public StringBuilder appendTo(StringBuilder builder) {
         return builder;
     }
 
+    /**
+     * The nearest enclosing object in the tree, or null when there is none. A node that carries
+     * only a token range, for an object no grammar rule opens a tree node for, has no parent.
+     */
     public ASTNodeAccess getParent() {
-        Node parent = (Node) node.jjtGetParent();
-        while (parent.jjtGetValue() == null) {
-            parent = (Node) parent.jjtGetParent();
-        }
-
-        return ASTNodeAccess.class.cast(parent.jjtGetValue());
+        return getParent(ASTNodeAccess.class);
     }
 
     public <T extends ASTNodeAccess> T getParent(Class<T> clazz) {
-        Node parent = (Node) node.jjtGetParent();
-        while (parent.jjtGetValue() == null || !clazz.isInstance(parent.jjtGetValue())) {
+        Node parent = node == null ? null : (Node) node.jjtGetParent();
+        while (parent != null && !clazz.isInstance(parent.jjtGetValue())) {
             parent = (Node) parent.jjtGetParent();
         }
-
-        return clazz.cast(parent.jjtGetValue());
+        return parent == null ? null : clazz.cast(parent.jjtGetValue());
     }
 
     @Override
diff --git a/src/main/java/net/sf/jsqlparser/parser/RangeNode.java b/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
new file mode 100644
index 0000000000..9b025a2ebc
--- /dev/null
+++ b/src/main/java/net/sf/jsqlparser/parser/RangeNode.java
@@ -0,0 +1,71 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2026 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.parser;
+
+/**
+ * A node outside the parse tree that records the tokens an object spans. It serves an object no
+ * grammar rule opens a tree node for, or one whose text runs past its tree node. In that second
+ * case it stands in for the tree node, answering its parent, children and id, with the wider range.
+ */
+final class RangeNode extends Node {
+    private final Node treeNode;
+
+    RangeNode(Token first, Token last, Node treeNode) {
+        super(CCJSqlParserTreeConstants.JJTEXPRESSION);
+        this.treeNode = treeNode;
+        jjtSetFirstToken(first);
+        jjtSetLastToken(last);
+    }
+
+    @Override
+    public Node jjtGetParent() {
+        return treeNode == null ? null : treeNode.jjtGetParent();
+    }
+
+    @Override
+    public Node[] jjtGetChildren() {
+        return treeNode == null ? super.jjtGetChildren() : treeNode.jjtGetChildren();
+    }
+
+    @Override
+    public Node jjtGetChild(int i) {
+        return treeNode == null ? super.jjtGetChild(i) : treeNode.jjtGetChild(i);
+    }
+
+    @Override
+    public int jjtGetNumChildren() {
+        return treeNode == null ? super.jjtGetNumChildren() : treeNode.jjtGetNumChildren();
+    }
+
+    @Override
+    public Object childrenAccept(CCJSqlParserVisitor visitor, Object data) {
+        return treeNode == null ? super.childrenAccept(visitor, data)
+                : treeNode.childrenAccept(visitor, data);
+    }
+
+    @Override
+    public int getId() {
+        return treeNode == null ? super.getId() : treeNode.getId();
+    }
+
+    @Override
+    public String toString() {
+        return treeNode == null ? super.toString() : treeNode.toString();
+    }
+
+    @Override
+    public void dump(String prefix) {
+        if (treeNode == null) {
+            super.dump(prefix);
+        } else {
+            treeNode.dump(prefix);
+        }
+    }
+}
diff --git a/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java b/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java
index 7530045e57..5b6c5e8259 100644
--- a/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java
+++ b/src/main/java/net/sf/jsqlparser/parser/SimpleCharStream.java
@@ -48,6 +48,9 @@ public class SimpleCharStream {
     protected boolean trackLineColumn = true;
     protected int totalCharsRead = 0;
     protected int absoluteTokenBegin = 0;
+    // line, column and absolute position of each match begun since the last positionSpecialTokens()
+    private int[] matchBegins = new int[24];
+    private int matchBeginCount = 0;
     int bufsize;
     int available;
     int tokenBegin;
@@ -107,6 +110,38 @@ public final int getAbsoluteTokenBegin() {
         return absoluteTokenBegin;
     }
 
+    /**
+     * Gives the comments in front of {@code token} the positions where their matches began, from
+     * the begins recorded since the last call, and forgets those. Comments come through no token
+     * action, so this is how they get a position. The comments chain backwards from the token while
+     * the begins are recorded forwards, so one backwards pass pairs them.
+     */
+    public final void positionSpecialTokens(Token token) {
+        int i = matchBeginCount - 3;
+        for (Token comment = token.specialToken; comment != null; comment = comment.specialToken) {
+            while (i >= 0 && (matchBegins[i] != comment.beginLine
+                    || matchBegins[i + 1] != comment.beginColumn)) {
+                i -= 3;
+            }
+            if (i < 0) {
+                break;
+            }
+            comment.absoluteBegin = matchBegins[i + 2];
+            comment.absoluteEnd = comment.absoluteBegin + comment.image.length();
+            i -= 3;
+        }
+        matchBeginCount = 0;
+    }
+
+    private void recordMatchBegin() {
+        if (matchBeginCount + 3 > matchBegins.length) {
+            matchBegins = java.util.Arrays.copyOf(matchBegins, matchBegins.length * 2);
+        }
+        matchBegins[matchBeginCount++] = getBeginLine();
+        matchBegins[matchBeginCount++] = getBeginColumn();
+        matchBegins[matchBeginCount++] = absoluteTokenBegin;
+    }
+
     protected void ExpandBuff(boolean wrapAround) {
         final int newSize = bufsize * 2;
         char[] newbuffer = new char[newSize];
@@ -200,6 +235,7 @@ public final char BeginToken() throws java.io.IOException {
         tokenBegin = bufpos;
 
         absoluteTokenBegin = totalCharsRead;
+        recordMatchBegin();
 
         if (c == '#' && featureConfiguration != null
                 && featureConfiguration.getAsBoolean(Feature.allowHashLineComments)) {
@@ -441,6 +477,7 @@ public final void backup(int amount) {
      * Reinitialise.
      */
     public void ReInit(Provider dstream, int startline, int startcolumn, int buffersize) {
+        matchBeginCount = 0;
         inputStream = dstream;
         line = startline;
         column = startcolumn - 1;
diff --git a/src/main/java/net/sf/jsqlparser/statement/AssertStatement.java b/src/main/java/net/sf/jsqlparser/statement/AssertStatement.java
index 1e5a742982..58a294bb5f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/AssertStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/AssertStatement.java
@@ -11,6 +11,7 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 import java.util.function.Consumer;
 
@@ -22,7 +23,7 @@
  *      "https://cloud.google.com/bigquery/docs/reference/standard-sql/debugging-statements">Debugging
  *      statements</a>
  */
-public class AssertStatement implements Statement {
+public class AssertStatement extends ASTNodeAccessImpl implements Statement {
     private Expression expression;
     private StringValue description;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/AttachStatement.java b/src/main/java/net/sf/jsqlparser/statement/AttachStatement.java
index 7ad71dd546..84726280d1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/AttachStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/AttachStatement.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 import java.util.List;
@@ -19,7 +20,7 @@
  *
  * @see <a href="https://duckdb.org/docs/stable/sql/statements/attach">ATTACH</a>
  */
-public class AttachStatement implements Statement {
+public class AttachStatement extends ASTNodeAccessImpl implements Statement {
     private String databasePath;
     private String alias;
     private boolean usingDatabaseKeyword;
diff --git a/src/main/java/net/sf/jsqlparser/statement/Block.java b/src/main/java/net/sf/jsqlparser/statement/Block.java
index f609e58262..a4e822f01b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/Block.java
+++ b/src/main/java/net/sf/jsqlparser/statement/Block.java
@@ -10,8 +10,9 @@
 package net.sf.jsqlparser.statement;
 
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
-public class Block implements Statement {
+public class Block extends ASTNodeAccessImpl implements Statement {
     private boolean hasSemicolonAfterEnd = false;
 
     private Statements statements;
diff --git a/src/main/java/net/sf/jsqlparser/statement/Commit.java b/src/main/java/net/sf/jsqlparser/statement/Commit.java
index 20df0a111c..37205308fc 100644
--- a/src/main/java/net/sf/jsqlparser/statement/Commit.java
+++ b/src/main/java/net/sf/jsqlparser/statement/Commit.java
@@ -9,7 +9,9 @@
  */
 package net.sf.jsqlparser.statement;
 
-public class Commit implements Statement {
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class Commit extends ASTNodeAccessImpl implements Statement {
     private TransactionKeyword keyword;
     private TransactionChain chain;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/ConnectStatement.java b/src/main/java/net/sf/jsqlparser/statement/ConnectStatement.java
index a5ae350c64..829410b280 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ConnectStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ConnectStatement.java
@@ -9,11 +9,13 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * DuckDB's {@code CONNECT target [AS alias]}, which routes the session's queries to a remote
  * database.
  */
-public class ConnectStatement implements Statement {
+public class ConnectStatement extends ASTNodeAccessImpl implements Statement {
     private String target;
     private String alias;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/CopyStatement.java b/src/main/java/net/sf/jsqlparser/statement/CopyStatement.java
index 0e05b58636..2697677dbb 100644
--- a/src/main/java/net/sf/jsqlparser/statement/CopyStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/CopyStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -25,7 +26,7 @@
  *
  * @see <a href="https://duckdb.org/docs/stable/sql/statements/copy">COPY</a>
  */
-public class CopyStatement implements Statement {
+public class CopyStatement extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private ExpressionList<Column> columns;
     private Select select;
diff --git a/src/main/java/net/sf/jsqlparser/statement/CreateFunctionalStatement.java b/src/main/java/net/sf/jsqlparser/statement/CreateFunctionalStatement.java
index d3f75a1278..b1978dc4a6 100644
--- a/src/main/java/net/sf/jsqlparser/statement/CreateFunctionalStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/CreateFunctionalStatement.java
@@ -15,13 +15,14 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.function.FunctionReturnType;
 import net.sf.jsqlparser.statement.create.table.TableElement;
 
 /**
  * A base for the declaration of function like statements
  */
-public abstract class CreateFunctionalStatement implements Statement {
+public abstract class CreateFunctionalStatement extends ASTNodeAccessImpl implements Statement {
 
     private String kind;
     private boolean orReplace = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/DeallocateStatement.java b/src/main/java/net/sf/jsqlparser/statement/DeallocateStatement.java
index 25d375e38b..58b0fe34cd 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DeallocateStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DeallocateStatement.java
@@ -9,10 +9,12 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * {@code DEALLOCATE [PREPARE] name}, which drops a statement prepared by {@link PrepareStatement}.
  */
-public class DeallocateStatement implements Statement {
+public class DeallocateStatement extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean usingPrepareKeyword;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/DeclareStatement.java b/src/main/java/net/sf/jsqlparser/statement/DeclareStatement.java
index 27537bc5ff..c189280b54 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DeclareStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DeclareStatement.java
@@ -18,10 +18,11 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.UserVariable;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.create.table.ColumnDefinition;
 
-public final class DeclareStatement implements Statement {
+public final class DeclareStatement extends ASTNodeAccessImpl implements Statement {
 
     private UserVariable userVariable = null;
     private DeclareType declareType = DeclareType.TYPE;
diff --git a/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java b/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java
index 054b648436..2efedba2d1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DescribeStatement.java
@@ -9,10 +9,11 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.select.Select;
 
-public class DescribeStatement implements Statement {
+public class DescribeStatement extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private Select select;
diff --git a/src/main/java/net/sf/jsqlparser/statement/DetachStatement.java b/src/main/java/net/sf/jsqlparser/statement/DetachStatement.java
index 80fe5780a9..d8bd25f810 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DetachStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DetachStatement.java
@@ -9,12 +9,14 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * DuckDB's {@code DETACH [DATABASE] [IF EXISTS] name}, the counterpart of {@link AttachStatement}.
  *
  * @see <a href="https://duckdb.org/docs/stable/sql/statements/attach">DETACH</a>
  */
-public class DetachStatement implements Statement {
+public class DetachStatement extends ASTNodeAccessImpl implements Statement {
     private String databaseName;
     private boolean usingDatabaseKeyword;
     private boolean ifExists;
diff --git a/src/main/java/net/sf/jsqlparser/statement/DisconnectStatement.java b/src/main/java/net/sf/jsqlparser/statement/DisconnectStatement.java
index fdbe6f4e71..1231963f67 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DisconnectStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DisconnectStatement.java
@@ -9,10 +9,12 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * DuckDB's {@code DISCONNECT [name]}, the counterpart of {@link ConnectStatement}.
  */
-public class DisconnectStatement implements Statement {
+public class DisconnectStatement extends ASTNodeAccessImpl implements Statement {
     private String name;
 
     public DisconnectStatement() {}
diff --git a/src/main/java/net/sf/jsqlparser/statement/DoStatement.java b/src/main/java/net/sf/jsqlparser/statement/DoStatement.java
index c595ea1a32..4f21c91f6a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/DoStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/DoStatement.java
@@ -11,9 +11,10 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /** A PostgreSQL anonymous routine. The language-specific body remains a string literal. */
-public class DoStatement implements Statement {
+public class DoStatement extends ASTNodeAccessImpl implements Statement {
     private StringValue code;
     private String language;
     private boolean languageBeforeCode;
diff --git a/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java b/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java
index 5442ce4c5e..22db6859f9 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ExplainStatement.java
@@ -14,12 +14,13 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 
 /**
  * An {@code EXPLAIN} statement
  */
-public class ExplainStatement implements Statement {
+public class ExplainStatement extends ASTNodeAccessImpl implements Statement {
     private String keyword;
     private Statement statement;
     private List<Option> options = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/ExtensionStatement.java b/src/main/java/net/sf/jsqlparser/statement/ExtensionStatement.java
index 6219273667..b14282b290 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ExtensionStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ExtensionStatement.java
@@ -9,13 +9,15 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * DuckDB's extension management statements {@code [FORCE] INSTALL extension [FROM repository]} and
  * {@code LOAD extension}.
  *
  * @see <a href="https://duckdb.org/docs/stable/extensions/overview">Extensions</a>
  */
-public class ExtensionStatement implements Statement {
+public class ExtensionStatement extends ASTNodeAccessImpl implements Statement {
     private Operation operation;
     private boolean force;
     private String extensionName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/IfElseStatement.java b/src/main/java/net/sf/jsqlparser/statement/IfElseStatement.java
index c9e6a6f266..a119702f41 100644
--- a/src/main/java/net/sf/jsqlparser/statement/IfElseStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/IfElseStatement.java
@@ -14,11 +14,12 @@
 import java.util.function.Consumer;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
  * @author <a href="mailto:andreas@manticore-projects.com">Andreas Reichel</a>
  */
-public class IfElseStatement implements Statement {
+public class IfElseStatement extends ASTNodeAccessImpl implements Statement {
     private final Expression condition;
     private final Statement ifStatement;
     private Statement elseStatement;
diff --git a/src/main/java/net/sf/jsqlparser/statement/PragmaStatement.java b/src/main/java/net/sf/jsqlparser/statement/PragmaStatement.java
index c1692e6df9..f515c6d3d4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/PragmaStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/PragmaStatement.java
@@ -11,6 +11,7 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
  * {@code PRAGMA name}, {@code PRAGMA name(arguments)} and {@code PRAGMA name = value}, used by
@@ -18,7 +19,7 @@
  *
  * @see <a href="https://duckdb.org/docs/stable/configuration/pragmas">PRAGMA statements</a>
  */
-public class PragmaStatement implements Statement {
+public class PragmaStatement extends ASTNodeAccessImpl implements Statement {
     private String name;
     private ExpressionList<?> parameters;
     private Expression value;
diff --git a/src/main/java/net/sf/jsqlparser/statement/PrepareStatement.java b/src/main/java/net/sf/jsqlparser/statement/PrepareStatement.java
index 6d682deb4e..93d66e4ed4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/PrepareStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/PrepareStatement.java
@@ -11,6 +11,7 @@
 
 import java.util.List;
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
@@ -21,7 +22,7 @@
  * @see <a href="https://duckdb.org/docs/stable/sql/query_syntax/prepared_statements">Prepared
  *      statements</a>
  */
-public class PrepareStatement implements Statement {
+public class PrepareStatement extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Statement statement;
     private List<ColDataType> parameterTypes;
diff --git a/src/main/java/net/sf/jsqlparser/statement/PurgeStatement.java b/src/main/java/net/sf/jsqlparser/statement/PurgeStatement.java
index 2dca9fbab3..a1b1f634a4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/PurgeStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/PurgeStatement.java
@@ -12,6 +12,7 @@
 
 import java.util.Objects;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.create.table.Index;
 
@@ -21,7 +22,7 @@
  *      "https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9018.htm">Purge</a>
  */
 
-public class PurgeStatement implements Statement {
+public class PurgeStatement extends ASTNodeAccessImpl implements Statement {
     private final PurgeObjectType purgeObjectType;
     private final Object object;
     private String userName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/ReleaseSavepointStatement.java b/src/main/java/net/sf/jsqlparser/statement/ReleaseSavepointStatement.java
index 292978382b..794844f75a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ReleaseSavepointStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ReleaseSavepointStatement.java
@@ -10,9 +10,10 @@
 package net.sf.jsqlparser.statement;
 
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /** RELEASE [SAVEPOINT] name. */
-public class ReleaseSavepointStatement implements Statement {
+public class ReleaseSavepointStatement extends ASTNodeAccessImpl implements Statement {
     private String savepointName;
     private boolean usingSavepointKeyword = true;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/ResetStatement.java b/src/main/java/net/sf/jsqlparser/statement/ResetStatement.java
index dc769a9e8e..6d40879f8f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ResetStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ResetStatement.java
@@ -9,8 +9,9 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
-public final class ResetStatement implements Statement {
+public final class ResetStatement extends ASTNodeAccessImpl implements Statement {
 
     private String name = "";
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/RollbackStatement.java b/src/main/java/net/sf/jsqlparser/statement/RollbackStatement.java
index d66857fb2c..b12f24edae 100644
--- a/src/main/java/net/sf/jsqlparser/statement/RollbackStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/RollbackStatement.java
@@ -25,10 +25,12 @@
 
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
 /**
  * @author are
  */
-public class RollbackStatement implements Statement {
+public class RollbackStatement extends ASTNodeAccessImpl implements Statement {
     private TransactionKeyword keyword;
     private TransactionChain chain;
     private boolean usingSavepointKeyword = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/SavepointStatement.java b/src/main/java/net/sf/jsqlparser/statement/SavepointStatement.java
index 390c7f438a..519d47d9e4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SavepointStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SavepointStatement.java
@@ -11,11 +11,12 @@
 package net.sf.jsqlparser.statement;
 
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
  * @author <a href="mailto:andreas@manticore-projects.com">Andreas Reichel</a>
  */
-public class SavepointStatement implements Statement {
+public class SavepointStatement extends ASTNodeAccessImpl implements Statement {
     private String savepointName;
 
     public SavepointStatement(String savepointName) {
diff --git a/src/main/java/net/sf/jsqlparser/statement/SessionStatement.java b/src/main/java/net/sf/jsqlparser/statement/SessionStatement.java
index 1c791bb1ac..e1780803ae 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SessionStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SessionStatement.java
@@ -13,8 +13,9 @@
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
-public class SessionStatement implements Statement {
+public class SessionStatement extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         START, APPLY, DROP, SHOW, DESCRIBE;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetDefaultRoleStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetDefaultRoleStatement.java
index 0e0268cde3..95e72b2bc8 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetDefaultRoleStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetDefaultRoleStatement.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.user.RoleSelection;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
 
@@ -22,7 +23,7 @@
  * {@code SET DEFAULT ROLE {role | NONE} [FOR user]} is kept with {@link #isForKeyword()}; without
  * accounts the statement applies to the current user.
  */
-public class SetDefaultRoleStatement implements Statement {
+public class SetDefaultRoleStatement extends ASTNodeAccessImpl implements Statement {
 
     private RoleSelection roles;
     private final List<UserAccount> accounts = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetIdentityInsertStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetIdentityInsertStatement.java
index 0c8c925fbb..90eba553a2 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetIdentityInsertStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetIdentityInsertStatement.java
@@ -11,10 +11,11 @@
 
 import java.util.Objects;
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 
 /** SQL Server SET IDENTITY_INSERT [database.][schema.]table ON | OFF. */
-public final class SetIdentityInsertStatement implements Statement {
+public final class SetIdentityInsertStatement extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private boolean on;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetPasswordStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetPasswordStatement.java
index 17125d55f0..4fa23f2ae4 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetPasswordStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetPasswordStatement.java
@@ -12,6 +12,7 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
 
 /**
@@ -19,7 +20,7 @@
  * [REPLACE 'current'] [RETAIN CURRENT PASSWORD]}. The password is an expression, usually a string
  * literal; MariaDB also accepts {@code PASSWORD('...')}.
  */
-public class SetPasswordStatement implements Statement {
+public class SetPasswordStatement extends ASTNodeAccessImpl implements Statement {
 
     private UserAccount account;
     private Expression password;
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetRoleStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetRoleStatement.java
index 4de3090f82..afc38b8bd1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetRoleStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetRoleStatement.java
@@ -9,13 +9,14 @@
  */
 package net.sf.jsqlparser.statement;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.user.RoleSelection;
 
 /**
  * MySQL/MariaDB {@code SET ROLE {DEFAULT | NONE | ALL [EXCEPT role, ...] | role, ...}}. PostgreSQL
  * {@code SET [SESSION | LOCAL] ROLE name} remains a {@link SetStatement}.
  */
-public class SetRoleStatement implements Statement {
+public class SetRoleStatement extends ASTNodeAccessImpl implements Statement {
 
     private RoleSelection roles;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/SetStatement.java b/src/main/java/net/sf/jsqlparser/statement/SetStatement.java
index a8fb98d58a..ff20a553de 100644
--- a/src/main/java/net/sf/jsqlparser/statement/SetStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/SetStatement.java
@@ -11,6 +11,7 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -20,7 +21,7 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 
-public final class SetStatement implements Statement {
+public final class SetStatement extends ASTNodeAccessImpl implements Statement {
 
     private final List<NameExpr> values = new ArrayList<>();
     private String effectParameter;
diff --git a/src/main/java/net/sf/jsqlparser/statement/ShowColumnsStatement.java b/src/main/java/net/sf/jsqlparser/statement/ShowColumnsStatement.java
index b5ec8324d4..5182afc659 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ShowColumnsStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ShowColumnsStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.show.ShowTablesStatement.SelectionMode;
 
@@ -19,7 +20,7 @@
  *
  * @see <a href="https://dev.mysql.com/doc/refman/8.4/en/show-columns.html">MySQL SHOW COLUMNS</a>
  */
-public class ShowColumnsStatement implements Statement {
+public class ShowColumnsStatement extends ASTNodeAccessImpl implements Statement {
 
     private boolean extended;
     private boolean full;
diff --git a/src/main/java/net/sf/jsqlparser/statement/ShowStatement.java b/src/main/java/net/sf/jsqlparser/statement/ShowStatement.java
index c5f1729cc4..c90bdea44e 100644
--- a/src/main/java/net/sf/jsqlparser/statement/ShowStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/ShowStatement.java
@@ -9,7 +9,9 @@
  */
 package net.sf.jsqlparser.statement;
 
-public class ShowStatement implements Statement {
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class ShowStatement extends ASTNodeAccessImpl implements Statement {
 
     private String name;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/StartTransaction.java b/src/main/java/net/sf/jsqlparser/statement/StartTransaction.java
index 78b513d91e..b502be481b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/StartTransaction.java
+++ b/src/main/java/net/sf/jsqlparser/statement/StartTransaction.java
@@ -12,9 +12,10 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /** START TRANSACTION, or BEGIN when a transaction dialect is selected. */
-public class StartTransaction implements Statement {
+public class StartTransaction extends ASTNodeAccessImpl implements Statement {
     public enum Command {
         START_TRANSACTION, BEGIN
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/TableMaintenanceStatement.java b/src/main/java/net/sf/jsqlparser/statement/TableMaintenanceStatement.java
index d056b699de..0593a85f82 100644
--- a/src/main/java/net/sf/jsqlparser/statement/TableMaintenanceStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/TableMaintenanceStatement.java
@@ -14,13 +14,14 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 
 /**
  * A MySQL/MariaDB {@code CHECK TABLE}, {@code OPTIMIZE TABLE} or {@code REPAIR TABLE} statement.
  * {@code ANALYZE TABLE} remains {@link net.sf.jsqlparser.statement.analyze.Analyze}.
  */
-public class TableMaintenanceStatement implements Statement {
+public class TableMaintenanceStatement extends ASTNodeAccessImpl implements Statement {
 
     public enum Operation {
         CHECK, OPTIMIZE, REPAIR;
diff --git a/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java b/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java
index f64a89fac7..e62cd560a5 100644
--- a/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/UnsupportedStatement.java
@@ -13,12 +13,13 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 /**
  * @author <a href="mailto:andreas@manticore-projects.com">Andreas Reichel</a>
  */
 
-public class UnsupportedStatement implements Statement {
+public class UnsupportedStatement extends ASTNodeAccessImpl implements Statement {
     private List<String> declarations;
 
     public UnsupportedStatement(List<String> declarations) {
diff --git a/src/main/java/net/sf/jsqlparser/statement/UseStatement.java b/src/main/java/net/sf/jsqlparser/statement/UseStatement.java
index b4b606849f..0d3732bc17 100644
--- a/src/main/java/net/sf/jsqlparser/statement/UseStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/UseStatement.java
@@ -9,7 +9,9 @@
  */
 package net.sf.jsqlparser.statement;
 
-public class UseStatement implements Statement {
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class UseStatement extends ASTNodeAccessImpl implements Statement {
 
     private String name;
     private boolean schemaKeyword;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/Alter.java b/src/main/java/net/sf/jsqlparser/statement/alter/Alter.java
index b2183ad915..fa22cae7fb 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/Alter.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/Alter.java
@@ -15,11 +15,12 @@
 import java.util.List;
 import java.util.Optional;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Alter implements Statement {
+public class Alter extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private boolean useOnly = false;
     private boolean useTableIfExists = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterCollation.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterCollation.java
index fd4bf30fec..0f71760bfa 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterCollation.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterCollation.java
@@ -9,10 +9,11 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterCollation implements Statement {
+public class AlterCollation extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         REFRESH_VERSION, RENAME, OWNER, SET_SCHEMA
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterDomain.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterDomain.java
index ca75f8faa6..e8f0efa5d5 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterDomain.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterDomain.java
@@ -11,12 +11,13 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.create.domain.DomainConstraint;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterDomain implements Statement {
+public class AlterDomain extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private Expression defaultExpression;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterEventTrigger.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterEventTrigger.java
index 0efb70b9bc..0dba7565f7 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterEventTrigger.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterEventTrigger.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -17,7 +18,7 @@
  * and rule actions of {@link RelationAlterAction}. Each non-null setter selects its action and
  * discards the values of the other actions.
  */
-public class AlterEventTrigger implements Statement {
+public class AlterEventTrigger extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         STATE, OWNER, RENAME
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExtension.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExtension.java
index 0affa5f43e..6414dc03d5 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterExtension.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterExtension.java
@@ -10,11 +10,12 @@
 package net.sf.jsqlparser.statement.alter;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.extension.ExtensionObject;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterExtension implements Statement {
+public class AlterExtension extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private Expression version;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterPolicy.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterPolicy.java
index 6cb23c0860..f0ac1e7c10 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterPolicy.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterPolicy.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.policy.PolicyOptions;
 
-public class AlterPolicy implements Statement {
+public class AlterPolicy extends ASTNodeAccessImpl implements Statement {
     private String policyName;
     private net.sf.jsqlparser.schema.Table table;
     private String newName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterPublication.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterPublication.java
index 6216403954..765a3863d2 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterPublication.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterPublication.java
@@ -13,12 +13,13 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.publication.PublicationTarget;
 import net.sf.jsqlparser.statement.create.publication.PublicationOption;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterPublication implements Statement {
+public class AlterPublication extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private List<PublicationTarget> targets = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterRelation.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterRelation.java
index 0c09943e10..6eb2c5c299 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterRelation.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterRelation.java
@@ -13,12 +13,13 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL ALTER INDEX, ALTER VIEW properties and ALTER MATERIALIZED VIEW. */
-public class AlterRelation implements Statement {
+public class AlterRelation extends ASTNodeAccessImpl implements Statement {
     public enum ObjectType {
         INDEX, VIEW, MATERIALIZED_VIEW
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterRoutine.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterRoutine.java
index 66f1717cc3..1c2be8454b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterRoutine.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterRoutine.java
@@ -14,6 +14,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.RoutineCharacteristic;
 import net.sf.jsqlparser.statement.RoutineReference;
 import net.sf.jsqlparser.statement.Statement;
@@ -27,7 +28,7 @@
  * Server's routine redefinitions remain
  * {@link net.sf.jsqlparser.statement.CreateFunctionalStatement} nodes.
  */
-public class AlterRoutine implements Statement {
+public class AlterRoutine extends ASTNodeAccessImpl implements Statement {
 
     public enum RoutineType {
         FUNCTION, PROCEDURE, ROUTINE
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSession.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSession.java
index e7e8308d99..c5e2ea2a63 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSession.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSession.java
@@ -12,6 +12,7 @@
 
 import java.util.List;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -20,7 +21,7 @@
  * @see <a href="https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_2012.htm">ALTER
  *      SESSION</a>
  */
-public class AlterSession implements Statement {
+public class AlterSession extends ASTNodeAccessImpl implements Statement {
     private AlterSessionOperation operation;
     private List<String> parameters;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterStatistics.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterStatistics.java
index b14f9977b2..53331a1729 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterStatistics.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterStatistics.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL statistics object metadata; a null target denotes SET STATISTICS DEFAULT. */
-public class AlterStatistics implements Statement {
+public class AlterStatistics extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         RENAME, OWNER, SET_SCHEMA, SET_STATISTICS
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSubscription.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSubscription.java
index 486ebb2d33..2203425052 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSubscription.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSubscription.java
@@ -14,11 +14,12 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.subscription.SubscriptionOption;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterSubscription implements Statement {
+public class AlterSubscription extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private StringValue connection;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSystemStatement.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSystemStatement.java
index 40ff46b061..6420f991aa 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterSystemStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterSystemStatement.java
@@ -12,6 +12,7 @@
 import java.util.List;
 import java.util.Objects;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -21,7 +22,7 @@
  *      SESSION</a>
  */
 
-public class AlterSystemStatement implements Statement {
+public class AlterSystemStatement extends ASTNodeAccessImpl implements Statement {
     private final AlterSystemOperation operation;
     private final List<String> parameters;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespace.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespace.java
index 13a0b2be21..b887e1c508 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespace.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespace.java
@@ -17,6 +17,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.table.IndexOption;
@@ -28,7 +29,7 @@
  * {@link Action} selects which properties are rendered. Moving all relations of a tablespace with
  * {@code ALTER TABLE ALL IN TABLESPACE} remains {@link AlterTablespaceMove}.
  */
-public class AlterTablespace implements Statement {
+public class AlterTablespace extends ASTNodeAccessImpl implements Statement {
 
     public enum Action {
         /** {@code RENAME TO newName}. */
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespaceMove.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespaceMove.java
index 789315a311..388b89821b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespaceMove.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTablespaceMove.java
@@ -11,12 +11,13 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
 /** Moves all matching relations from one PostgreSQL tablespace to another. */
-public class AlterTablespaceMove implements Statement {
+public class AlterTablespaceMove extends ASTNodeAccessImpl implements Statement {
     public enum ObjectType {
         TABLE, INDEX, MATERIALIZED_VIEW
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTextSearchConfiguration.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTextSearchConfiguration.java
index cd7b1bfd48..29c459d019 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTextSearchConfiguration.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTextSearchConfiguration.java
@@ -9,12 +9,13 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import java.util.ArrayList;
 import java.util.List;
 
-public class AlterTextSearchConfiguration implements Statement {
+public class AlterTextSearchConfiguration extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         ADD_MAPPING, ALTER_MAPPING, REPLACE_MAPPING, DROP_MAPPING, RENAME, OWNER, SET_SCHEMA
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTrigger.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTrigger.java
index de3be507e7..8290beff90 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterTrigger.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterTrigger.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.alter;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -17,7 +18,7 @@
  * PostgreSQL {@code ALTER TRIGGER name ON table}, which renames the trigger or marks it as
  * dependent on an extension. Names retain SQL identifier quoting.
  */
-public class AlterTrigger implements Statement {
+public class AlterTrigger extends ASTNodeAccessImpl implements Statement {
 
     public enum Action {
         /** {@code RENAME TO}, see {@link #getNewName()}. */
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterType.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterType.java
index 25361bbc4d..ba486a89ae 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterType.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterType.java
@@ -13,12 +13,13 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.create.type.TypeAttribute;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterType implements Statement {
+public class AlterType extends ASTNodeAccessImpl implements Statement {
     private String name;
     private Action action;
     private String newName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/AlterUser.java b/src/main/java/net/sf/jsqlparser/statement/alter/AlterUser.java
index b27dfa07bd..04c9805ecb 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/AlterUser.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/AlterUser.java
@@ -15,6 +15,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
@@ -29,7 +30,7 @@
  * {@link UserOptions#getDefaultRoles()}. {@code ALTER USER USER() ...} names the current user with
  * the unquoted account name {@code USER()}, see {@link #isUserFunction()}.
  */
-public class AlterUser implements Statement {
+public class AlterUser extends ASTNodeAccessImpl implements Statement {
 
     private static final String USER_FUNCTION = "USER()";
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/RenameTableStatement.java b/src/main/java/net/sf/jsqlparser/statement/alter/RenameTableStatement.java
index c119d1c4d2..1b4537c513 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/RenameTableStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/RenameTableStatement.java
@@ -16,6 +16,7 @@
 import java.util.Objects;
 import java.util.Set;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -25,7 +26,7 @@
  * @see <a href=
  *      "https://docs.oracle.com/cd/B19306_01/server.102/b14200/statements_9019.htm">Rename</a>
  */
-public class RenameTableStatement implements Statement {
+public class RenameTableStatement extends ASTNodeAccessImpl implements Statement {
     private final LinkedHashMap<Table, Table> tableNames = new LinkedHashMap<>();
 
     private boolean usingTableKeyword = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/RenameUser.java b/src/main/java/net/sf/jsqlparser/statement/alter/RenameUser.java
index 152936b91a..77c694cdd0 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/RenameUser.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/RenameUser.java
@@ -15,12 +15,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
 
 /** MySQL {@code RENAME USER old TO new [, old TO new] ...} statement. */
-public class RenameUser implements Statement {
+public class RenameUser extends ASTNodeAccessImpl implements Statement {
 
     private final List<Rename> renames = new ArrayList<>();
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/database/AlterDatabase.java b/src/main/java/net/sf/jsqlparser/statement/alter/database/AlterDatabase.java
index 540d1fb1c4..c01ab3409f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/database/AlterDatabase.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/database/AlterDatabase.java
@@ -14,6 +14,7 @@
 import java.util.Optional;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.ConfigurationParameterChange;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -24,7 +25,7 @@
  * options, and a missing name selects the current database. The options use the same
  * {@link DatabaseOption} model as {@code CREATE DATABASE}. Names retain SQL identifier quoting.
  */
-public class AlterDatabase implements Statement {
+public class AlterDatabase extends ASTNodeAccessImpl implements Statement {
 
     public enum Action {
         /** MySQL options or PostgreSQL {@code [WITH] option ...}, see {@link #getOptions()}. */
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/schema/AlterSchema.java b/src/main/java/net/sf/jsqlparser/statement/alter/schema/AlterSchema.java
index 44dd63ae8c..f88aa08b82 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/schema/AlterSchema.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/schema/AlterSchema.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.alter.schema;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL schema name or ownership change. Names retain SQL identifier quoting. */
-public class AlterSchema implements Statement {
+public class AlterSchema extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         RENAME, OWNER
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/alter/sequence/AlterSequence.java b/src/main/java/net/sf/jsqlparser/statement/alter/sequence/AlterSequence.java
index ccd3a52600..644a8382b1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/alter/sequence/AlterSequence.java
+++ b/src/main/java/net/sf/jsqlparser/statement/alter/sequence/AlterSequence.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.alter.sequence;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Sequence;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -16,7 +17,7 @@
 /**
  * An {@code ALTER SEQUENCE} statement
  */
-public class AlterSequence implements Statement {
+public class AlterSequence extends ASTNodeAccessImpl implements Statement {
 
     public enum Action {
         PARAMETERS, RENAME, OWNER, SET_SCHEMA, SET_LOGGED, SET_UNLOGGED
diff --git a/src/main/java/net/sf/jsqlparser/statement/analyze/Analyze.java b/src/main/java/net/sf/jsqlparser/statement/analyze/Analyze.java
index 558de06ad6..4acd7e435c 100644
--- a/src/main/java/net/sf/jsqlparser/statement/analyze/Analyze.java
+++ b/src/main/java/net/sf/jsqlparser/statement/analyze/Analyze.java
@@ -14,12 +14,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Analyze implements Statement {
+public class Analyze extends ASTNodeAccessImpl implements Statement {
 
     public enum Modifier {
         NO_WRITE_TO_BINLOG, LOCAL
diff --git a/src/main/java/net/sf/jsqlparser/statement/comment/Comment.java b/src/main/java/net/sf/jsqlparser/statement/comment/Comment.java
index 1a5310be0c..f5f95ac245 100755
--- a/src/main/java/net/sf/jsqlparser/statement/comment/Comment.java
+++ b/src/main/java/net/sf/jsqlparser/statement/comment/Comment.java
@@ -11,12 +11,13 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Comment implements Statement {
+public class Comment extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private Column column;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/accessmethod/CreateAccessMethod.java b/src/main/java/net/sf/jsqlparser/statement/create/accessmethod/CreateAccessMethod.java
index 21959d7fe1..feb0086435 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/accessmethod/CreateAccessMethod.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/accessmethod/CreateAccessMethod.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.create.accessmethod;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** A PostgreSQL table or index access method, whose handler names a function, not a table. */
-public class CreateAccessMethod implements Statement {
+public class CreateAccessMethod extends ASTNodeAccessImpl implements Statement {
     public enum Type {
         TABLE, INDEX
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/collation/CreateCollation.java b/src/main/java/net/sf/jsqlparser/statement/create/collation/CreateCollation.java
index 2f1b06a1b9..9aa9dcc732 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/collation/CreateCollation.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/collation/CreateCollation.java
@@ -12,12 +12,13 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.table.IndexOption;
 
 /** PostgreSQL collation copy or parameter definition, with mutually exclusive forms. */
-public class CreateCollation implements Statement {
+public class CreateCollation extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean ifNotExists;
     private String sourceCollation;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/database/CreateDatabase.java b/src/main/java/net/sf/jsqlparser/statement/create/database/CreateDatabase.java
index 76a447fa28..4376ce0757 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/database/CreateDatabase.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/database/CreateDatabase.java
@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Optional;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -24,7 +25,7 @@
  * PostgreSQL options are typed {@link DatabaseOption}s; other option text is kept as a raw
  * {@link DatabaseOption.Kind#OTHER} option.
  */
-public class CreateDatabase implements Statement {
+public class CreateDatabase extends ASTNodeAccessImpl implements Statement {
 
     private String databaseName;
     private boolean hasIfNotExists = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/domain/CreateDomain.java b/src/main/java/net/sf/jsqlparser/statement/create/domain/CreateDomain.java
index 61da30eb1e..f079ca7b7d 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/domain/CreateDomain.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/domain/CreateDomain.java
@@ -13,11 +13,12 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateDomain implements Statement {
+public class CreateDomain extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean useAs;
     private ColDataType dataType;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/event/EventStatement.java b/src/main/java/net/sf/jsqlparser/statement/create/event/EventStatement.java
index 77427d33fd..409fc67237 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/event/EventStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/event/EventStatement.java
@@ -10,12 +10,13 @@
 package net.sf.jsqlparser.statement.create.event;
 
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.MySqlDefiner;
 import net.sf.jsqlparser.statement.Statement;
 
 /** Common structured properties of MySQL {@code CREATE EVENT} and {@code ALTER EVENT}. */
-public abstract class EventStatement implements Statement {
+public abstract class EventStatement extends ASTNodeAccessImpl implements Statement {
 
     private MySqlDefiner definer;
     private Table event;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtension.java b/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtension.java
index bbac3276ed..ea9b25fe39 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtension.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtension.java
@@ -12,10 +12,11 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateExtension implements Statement {
+public class CreateExtension extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean ifNotExists;
     private boolean useWith;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtensionRepository.java b/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtensionRepository.java
index f3b85ccee4..d29ec07d87 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtensionRepository.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/extension/CreateExtensionRepository.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.create.extension;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -17,7 +18,7 @@
  * DuckDB 2.0's {@code CREATE EXTENSION REPOSITORY [IF NOT EXISTS] name [WITH PREFIX prefix]}, which
  * registers a custom repository extensions may be installed from.
  */
-public class CreateExtensionRepository implements Statement {
+public class CreateExtensionRepository extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean ifNotExists;
     private Expression prefix;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java b/src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java
index 9e5739ae55..b583654aa2 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/index/CreateIndex.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.create.index;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.IndexOption;
 import net.sf.jsqlparser.statement.create.table.KeyElement;
 import java.util.*;
@@ -18,7 +19,7 @@
 import net.sf.jsqlparser.statement.*;
 import net.sf.jsqlparser.statement.create.table.*;
 
-public class CreateIndex implements Statement {
+public class CreateIndex extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private Index index;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/macro/CreateMacro.java b/src/main/java/net/sf/jsqlparser/statement/create/macro/CreateMacro.java
index addf28daa1..7c509a48ee 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/macro/CreateMacro.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/macro/CreateMacro.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.create.macro;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.table.ColDataType;
@@ -36,7 +37,7 @@
  *
  * @see <a href="https://duckdb.org/docs/stable/sql/statements/create_macro">CREATE MACRO</a>
  */
-public class CreateMacro implements Statement {
+public class CreateMacro extends ASTNodeAccessImpl implements Statement {
     private boolean orReplace;
     private boolean temporary;
     private boolean functionKeyword;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/policy/CreatePolicy.java b/src/main/java/net/sf/jsqlparser/statement/create/policy/CreatePolicy.java
index caf4243594..267c946d95 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/policy/CreatePolicy.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/policy/CreatePolicy.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.create.policy;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -24,7 +25,7 @@
  * | INSERT | UPDATE | DELETE } ] [ TO { role_name | PUBLIC | CURRENT_ROLE | CURRENT_USER |
  * SESSION_USER } [, ...] ] [ USING ( using_expression ) ] [ WITH CHECK ( check_expression ) ]
  */
-public class CreatePolicy implements Statement {
+public class CreatePolicy extends ASTNodeAccessImpl implements Statement {
 
     private String policyName;
     private Table table;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/publication/CreatePublication.java b/src/main/java/net/sf/jsqlparser/statement/create/publication/CreatePublication.java
index b749f11d60..5a8433b28d 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/publication/CreatePublication.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/publication/CreatePublication.java
@@ -13,10 +13,11 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreatePublication implements Statement {
+public class CreatePublication extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean allTables;
     private List<PublicationTarget> targets = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/rule/CreateRule.java b/src/main/java/net/sf/jsqlparser/statement/create/rule/CreateRule.java
index 44e1ef134a..a9984106cb 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/rule/CreateRule.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/rule/CreateRule.java
@@ -13,12 +13,13 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL rewrite rule whose actions reuse ordinary statement AST nodes. */
-public class CreateRule implements Statement {
+public class CreateRule extends ASTNodeAccessImpl implements Statement {
     public enum Event {
         SELECT, INSERT, UPDATE, DELETE
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/schema/CreateSchema.java b/src/main/java/net/sf/jsqlparser/statement/create/schema/CreateSchema.java
index 6e8d2da999..bff382a374 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/schema/CreateSchema.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/schema/CreateSchema.java
@@ -17,11 +17,12 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.database.DatabaseOption;
 
-public class CreateSchema implements Statement {
+public class CreateSchema extends ASTNodeAccessImpl implements Statement {
 
     private String authorization;
     private String catalogName = null;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/sequence/CreateSequence.java b/src/main/java/net/sf/jsqlparser/statement/create/sequence/CreateSequence.java
index 6c3ed901cd..f005e3b0d1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/sequence/CreateSequence.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/sequence/CreateSequence.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.create.sequence;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Sequence;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -16,7 +17,7 @@
 /**
  * A {@code CREATE SEQUENCE} statement
  */
-public class CreateSequence implements Statement {
+public class CreateSequence extends ASTNodeAccessImpl implements Statement {
 
     public enum Persistence {
         TEMP, TEMPORARY, UNLOGGED, LOCAL_TEMP, LOCAL_TEMPORARY, GLOBAL_TEMP, GLOBAL_TEMPORARY
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/statistics/CreateStatistics.java b/src/main/java/net/sf/jsqlparser/statement/create/statistics/CreateStatistics.java
index 4e9775f70c..df966df81c 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/statistics/CreateStatistics.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/statistics/CreateStatistics.java
@@ -14,12 +14,13 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL extended statistics over columns and parenthesized expressions. */
-public class CreateStatistics implements Statement {
+public class CreateStatistics extends ASTNodeAccessImpl implements Statement {
     public enum Kind {
         NDISTINCT, DEPENDENCIES, MCV
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/subscription/CreateSubscription.java b/src/main/java/net/sf/jsqlparser/statement/create/subscription/CreateSubscription.java
index 75d193e0e4..b67dda66c1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/subscription/CreateSubscription.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/subscription/CreateSubscription.java
@@ -14,10 +14,11 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateSubscription implements Statement {
+public class CreateSubscription extends ASTNodeAccessImpl implements Statement {
     private String name;
     private StringValue connection;
     private List<String> publications = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/synonym/CreateSynonym.java b/src/main/java/net/sf/jsqlparser/statement/create/synonym/CreateSynonym.java
index ac7eb2640b..9411ba577b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/synonym/CreateSynonym.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/synonym/CreateSynonym.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.create.synonym;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Synonym;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -16,7 +17,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class CreateSynonym implements Statement {
+public class CreateSynonym extends ASTNodeAccessImpl implements Statement {
 
     public Synonym synonym;
     private boolean orReplace;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java b/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java
index 372abc4b7e..ff90bf875d 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java
@@ -10,9 +10,9 @@
 package net.sf.jsqlparser.statement.create.table;
 
 import net.sf.jsqlparser.expression.IntervalQualifier;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
-import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,7 +23,7 @@
 
 import static java.util.stream.Collectors.joining;
 
-public class ColDataType implements Serializable {
+public class ColDataType extends ASTNodeAccessImpl {
 
     public enum Signedness {
         SIGNED, UNSIGNED
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java b/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java
index 38215b5dc2..ed0d930097 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/table/CreateTable.java
@@ -16,6 +16,7 @@
 import java.util.Optional;
 
 import net.sf.jsqlparser.expression.SpannerInterleaveIn;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.LikeClause;
@@ -23,7 +24,7 @@
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 
-public class CreateTable implements Statement {
+public class CreateTable extends ASTNodeAccessImpl implements Statement {
 
     private boolean tableOptionsAfterPartition;
     private net.sf.jsqlparser.statement.execute.Execute execute;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/tablespace/CreateTablespace.java b/src/main/java/net/sf/jsqlparser/statement/create/tablespace/CreateTablespace.java
index a743055a60..45901d661e 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/tablespace/CreateTablespace.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/tablespace/CreateTablespace.java
@@ -18,6 +18,7 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.table.IndexOption;
@@ -29,7 +30,7 @@
  * options. MySQL options reuse the {@link TableOption} models of the same name, plus
  * {@link TableOption.Kind#FILE_BLOCK_SIZE}.
  */
-public class CreateTablespace implements Statement {
+public class CreateTablespace extends ASTNodeAccessImpl implements Statement {
     private String name;
     private boolean undo;
     private String owner;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/textsearch/CreateTextSearchConfiguration.java b/src/main/java/net/sf/jsqlparser/statement/create/textsearch/CreateTextSearchConfiguration.java
index dbca5ef669..ae214768bd 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/textsearch/CreateTextSearchConfiguration.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/textsearch/CreateTextSearchConfiguration.java
@@ -9,10 +9,11 @@
  */
 package net.sf.jsqlparser.statement.create.textsearch;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateTextSearchConfiguration implements Statement {
+public class CreateTextSearchConfiguration extends ASTNodeAccessImpl implements Statement {
     public enum SourceKind {
         PARSER, COPY
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateEventTrigger.java b/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateEventTrigger.java
index daa1ace7c9..13f0e5b09a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateEventTrigger.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateEventTrigger.java
@@ -18,6 +18,7 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Function;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -27,7 +28,7 @@
  * invoked like a {@link CreateTrigger} routine, with the same {@code FUNCTION} or {@code PROCEDURE}
  * spelling, but never takes arguments.
  */
-public class CreateEventTrigger implements Statement {
+public class CreateEventTrigger extends ASTNodeAccessImpl implements Statement {
 
     private String name;
     private String event;
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateTrigger.java b/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateTrigger.java
index ce48fdf0d1..bcda2c8f59 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateTrigger.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/trigger/CreateTrigger.java
@@ -14,13 +14,14 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Function;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.create.table.ConstraintAttributes;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** MySQL and PostgreSQL trigger definitions with distinct body and routine-invocation forms. */
-public class CreateTrigger implements Statement {
+public class CreateTrigger extends ASTNodeAccessImpl implements Statement {
 
     public enum Timing {
         BEFORE, AFTER, INSTEAD_OF
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/type/CreateType.java b/src/main/java/net/sf/jsqlparser/statement/create/type/CreateType.java
index 891c5bdb0c..4d84bbd229 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/type/CreateType.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/type/CreateType.java
@@ -10,10 +10,11 @@
 package net.sf.jsqlparser.statement.create.type;
 
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class CreateType implements Statement {
+public class CreateType extends ASTNodeAccessImpl implements Statement {
     private String name;
     private TypeDefinition definition;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/user/CreateUser.java b/src/main/java/net/sf/jsqlparser/statement/create/user/CreateUser.java
index c08e342a82..480500d2c2 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/user/CreateUser.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/user/CreateUser.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -22,7 +23,7 @@
  * {@link UserOptions} after the account list are shared with
  * {@link net.sf.jsqlparser.statement.alter.AlterUser}.
  */
-public class CreateUser implements Statement {
+public class CreateUser extends ASTNodeAccessImpl implements Statement {
 
     private boolean ifNotExists;
     private final List<UserAccount> accounts = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java b/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java
index 1ede9e8f13..44430df573 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/view/AlterView.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.create.view;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -21,7 +22,7 @@
 import java.util.List;
 import java.util.Optional;
 
-public class AlterView implements Statement {
+public class AlterView extends ASTNodeAccessImpl implements Statement {
 
     private MySqlViewOptions mySqlOptions;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java b/src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java
index 8727b6be04..72e83f546d 100644
--- a/src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java
+++ b/src/main/java/net/sf/jsqlparser/statement/create/view/CreateView.java
@@ -13,6 +13,7 @@
 import java.util.List;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
@@ -21,7 +22,7 @@
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 
-public class CreateView implements Statement {
+public class CreateView extends ASTNodeAccessImpl implements Statement {
 
     private MySqlViewOptions mySqlOptions;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/delete/Delete.java b/src/main/java/net/sf/jsqlparser/statement/delete/Delete.java
index 46745d4df2..c988eaf70b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/delete/Delete.java
+++ b/src/main/java/net/sf/jsqlparser/statement/delete/Delete.java
@@ -12,6 +12,7 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.OracleHint;
 import net.sf.jsqlparser.expression.PreferringClause;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.ForPortionClause;
 import net.sf.jsqlparser.statement.OutputClause;
@@ -36,7 +37,7 @@
 
 import static java.util.stream.Collectors.joining;
 
-public class Delete implements Statement {
+public class Delete extends ASTNodeAccessImpl implements Statement {
 
     private List<WithItem<?>> withItemsList;
     private Table table;
diff --git a/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java b/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
index ddd56863dc..d0e751a587 100644
--- a/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
+++ b/src/main/java/net/sf/jsqlparser/statement/drop/Drop.java
@@ -19,6 +19,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.RoutineReference;
@@ -28,7 +29,7 @@
 import net.sf.jsqlparser.statement.create.user.UserAccount;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 
-public class Drop implements Statement {
+public class Drop extends ASTNodeAccessImpl implements Statement {
 
     public enum ObjectType {
         DATABASE, EVENT, FUNCTION, INDEX, PROCEDURE, SCHEMA, SEQUENCE, SERVER, TABLE, TABLESPACE, TRIGGER, VIEW, FOREIGN_TABLE, FOREIGN_DATA_WRAPPER, AGGREGATE, DOMAIN, EVENT_TRIGGER, GROUP, OWNED, ROLE, ROUTINE, RULE, TYPE, USER, SYNONYM, OTHER;
diff --git a/src/main/java/net/sf/jsqlparser/statement/drop/DropPolicy.java b/src/main/java/net/sf/jsqlparser/statement/drop/DropPolicy.java
index 41f8f01b0b..c276d7e4fc 100644
--- a/src/main/java/net/sf/jsqlparser/statement/drop/DropPolicy.java
+++ b/src/main/java/net/sf/jsqlparser/statement/drop/DropPolicy.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.drop;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class DropPolicy implements Statement {
+public class DropPolicy extends ASTNodeAccessImpl implements Statement {
     private String policyName;
     private net.sf.jsqlparser.schema.Table table;
     private boolean ifExists = false;
diff --git a/src/main/java/net/sf/jsqlparser/statement/execute/Execute.java b/src/main/java/net/sf/jsqlparser/statement/execute/Execute.java
index cb2d8439f4..cde107b66e 100644
--- a/src/main/java/net/sf/jsqlparser/statement/execute/Execute.java
+++ b/src/main/java/net/sf/jsqlparser/statement/execute/Execute.java
@@ -15,12 +15,13 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 import java.util.List;
 
-public class Execute implements Statement {
+public class Execute extends ASTNodeAccessImpl implements Statement {
 
     private ExecType execType = ExecType.EXECUTE;
     private String name;
diff --git a/src/main/java/net/sf/jsqlparser/statement/export/Export.java b/src/main/java/net/sf/jsqlparser/statement/export/Export.java
index dd6628a20e..2c6934270b 100644
--- a/src/main/java/net/sf/jsqlparser/statement/export/Export.java
+++ b/src/main/java/net/sf/jsqlparser/statement/export/Export.java
@@ -10,13 +10,14 @@
 package net.sf.jsqlparser.statement.export;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.*;
 
-public class Export implements Statement {
+public class Export extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private ExpressionList<Column> columns;
     private Select select;
diff --git a/src/main/java/net/sf/jsqlparser/statement/export/ExportDataStatement.java b/src/main/java/net/sf/jsqlparser/statement/export/ExportDataStatement.java
index 512ad0a843..1ea8e8074a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/export/ExportDataStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/export/ExportDataStatement.java
@@ -11,6 +11,7 @@
 
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.select.Select;
@@ -24,7 +25,7 @@
  *      "https://cloud.google.com/bigquery/docs/reference/standard-sql/export-statements">Export
  *      statements</a>
  */
-public class ExportDataStatement implements Statement {
+public class ExportDataStatement extends ASTNodeAccessImpl implements Statement {
     private String connectionName;
     private ExpressionList<Expression> options;
     private Select select;
diff --git a/src/main/java/net/sf/jsqlparser/statement/foreign/ForeignDataStatement.java b/src/main/java/net/sf/jsqlparser/statement/foreign/ForeignDataStatement.java
index b97afa7091..2ea9cfedf9 100644
--- a/src/main/java/net/sf/jsqlparser/statement/foreign/ForeignDataStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/foreign/ForeignDataStatement.java
@@ -12,11 +12,12 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.create.table.ForeignDataOption;
 
 /** Shared structured options for PostgreSQL foreign-data DDL. */
-public abstract class ForeignDataStatement implements Statement {
+public abstract class ForeignDataStatement extends ASTNodeAccessImpl implements Statement {
     private List<ForeignDataOption> options;
 
     public List<ForeignDataOption> getOptions() {
diff --git a/src/main/java/net/sf/jsqlparser/statement/grant/AlterDefaultPrivileges.java b/src/main/java/net/sf/jsqlparser/statement/grant/AlterDefaultPrivileges.java
index 42003ceee8..c726c1a843 100644
--- a/src/main/java/net/sf/jsqlparser/statement/grant/AlterDefaultPrivileges.java
+++ b/src/main/java/net/sf/jsqlparser/statement/grant/AlterDefaultPrivileges.java
@@ -12,10 +12,11 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class AlterDefaultPrivileges implements Statement {
+public class AlterDefaultPrivileges extends ASTNodeAccessImpl implements Statement {
     public enum RoleKeyword {
         ROLE, USER
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/grant/Grant.java b/src/main/java/net/sf/jsqlparser/statement/grant/Grant.java
index 3962e967d6..ab28a2cbfc 100644
--- a/src/main/java/net/sf/jsqlparser/statement/grant/Grant.java
+++ b/src/main/java/net/sf/jsqlparser/statement/grant/Grant.java
@@ -17,11 +17,12 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.RoleSelection;
 
-public class Grant implements Statement {
+public class Grant extends ASTNodeAccessImpl implements Statement {
     private PrivilegeClause clause = new PrivilegeClause();
     private final List<GrantOption> options = new ArrayList<>();
     private Grantee asUser;
diff --git a/src/main/java/net/sf/jsqlparser/statement/grant/Revoke.java b/src/main/java/net/sf/jsqlparser/statement/grant/Revoke.java
index 620827f582..577ebdd52e 100644
--- a/src/main/java/net/sf/jsqlparser/statement/grant/Revoke.java
+++ b/src/main/java/net/sf/jsqlparser/statement/grant/Revoke.java
@@ -11,11 +11,12 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Revoke implements Statement {
+public class Revoke extends ASTNodeAccessImpl implements Statement {
     private PrivilegeClause clause = new PrivilegeClause();
     private boolean ifExists;
     private GrantOption.Kind optionFor;
diff --git a/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java b/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java
index 3541c1022f..7d32939f01 100644
--- a/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java
+++ b/src/main/java/net/sf/jsqlparser/statement/insert/Insert.java
@@ -17,6 +17,7 @@
 import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.OracleHint;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Partition;
 import net.sf.jsqlparser.schema.Table;
@@ -32,7 +33,7 @@
 import net.sf.jsqlparser.statement.update.UpdateSet;
 
 @SuppressWarnings({"PMD.CyclomaticComplexity"})
-public class Insert implements Statement {
+public class Insert extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private OracleHint oracleHint = null;
diff --git a/src/main/java/net/sf/jsqlparser/statement/insert/InsertBulk.java b/src/main/java/net/sf/jsqlparser/statement/insert/InsertBulk.java
index 8464a4fa99..c0fa0d4430 100644
--- a/src/main/java/net/sf/jsqlparser/statement/insert/InsertBulk.java
+++ b/src/main/java/net/sf/jsqlparser/statement/insert/InsertBulk.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -20,7 +21,7 @@
 import net.sf.jsqlparser.statement.select.OrderByElement;
 
 /** SQL Server's SQL declaration preceding a separate bulk-load data stream. */
-public class InsertBulk implements Statement {
+public class InsertBulk extends ASTNodeAccessImpl implements Statement {
     private Table table;
     private List<ColumnDefinition> columns = new ArrayList<>();
     private List<Option> options = new ArrayList<>();
diff --git a/src/main/java/net/sf/jsqlparser/statement/load/LoadDataStatement.java b/src/main/java/net/sf/jsqlparser/statement/load/LoadDataStatement.java
index 3e04159f1e..16c8a42b0f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/load/LoadDataStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/load/LoadDataStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.load;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -26,7 +27,7 @@
  *      "https://cloud.google.com/bigquery/docs/reference/standard-sql/load-statements">Load
  *      statements</a>
  */
-public class LoadDataStatement implements Statement {
+public class LoadDataStatement extends ASTNodeAccessImpl implements Statement {
     private boolean overwrite;
     private Table table;
     private List<ColumnDefinition> columnDefinitions;
diff --git a/src/main/java/net/sf/jsqlparser/statement/lock/LockStatement.java b/src/main/java/net/sf/jsqlparser/statement/lock/LockStatement.java
index e7a592c3db..e72c259f06 100644
--- a/src/main/java/net/sf/jsqlparser/statement/lock/LockStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/lock/LockStatement.java
@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -22,7 +23,7 @@
  * LOCK TABLE t IN EXCLUSIVE MODE<br>
  * <br>
  */
-public class LockStatement implements Statement {
+public class LockStatement extends ASTNodeAccessImpl implements Statement {
 
     private final List<Target> targets = new ArrayList<>();
     private boolean useTableKeyword = true;
diff --git a/src/main/java/net/sf/jsqlparser/statement/merge/Merge.java b/src/main/java/net/sf/jsqlparser/statement/merge/Merge.java
index 10b0123d38..e047de72c0 100644
--- a/src/main/java/net/sf/jsqlparser/statement/merge/Merge.java
+++ b/src/main/java/net/sf/jsqlparser/statement/merge/Merge.java
@@ -12,6 +12,7 @@
 import net.sf.jsqlparser.expression.Alias;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.OracleHint;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.OutputClause;
 import net.sf.jsqlparser.statement.ReturningClause;
@@ -30,7 +31,7 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-public class Merge implements Statement {
+public class Merge extends ASTNodeAccessImpl implements Statement {
 
     private List<WithItem<?>> withItemsList;
     private Table table;
diff --git a/src/main/java/net/sf/jsqlparser/statement/notify/NotifyStatement.java b/src/main/java/net/sf/jsqlparser/statement/notify/NotifyStatement.java
index ff8e6dcc1e..27a2b77510 100644
--- a/src/main/java/net/sf/jsqlparser/statement/notify/NotifyStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/notify/NotifyStatement.java
@@ -12,11 +12,12 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** PostgreSQL NOTIFY, usable independently and in CREATE RULE actions. */
-public class NotifyStatement implements Statement {
+public class NotifyStatement extends ASTNodeAccessImpl implements Statement {
     private String channel;
     private StringValue payload;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/oracle/OracleAssignment.java b/src/main/java/net/sf/jsqlparser/statement/oracle/OracleAssignment.java
index 857df3245f..42647c1e26 100644
--- a/src/main/java/net/sf/jsqlparser/statement/oracle/OracleAssignment.java
+++ b/src/main/java/net/sf/jsqlparser/statement/oracle/OracleAssignment.java
@@ -11,11 +11,12 @@
 
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** Assignment to an Oracle block variable, record field or bind parameter. */
-public class OracleAssignment implements Statement {
+public class OracleAssignment extends ASTNodeAccessImpl implements Statement {
     private Expression target;
     private Expression value;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/oracle/OracleNullStatement.java b/src/main/java/net/sf/jsqlparser/statement/oracle/OracleNullStatement.java
index 9d73405fbb..8e8c6cfbee 100644
--- a/src/main/java/net/sf/jsqlparser/statement/oracle/OracleNullStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/oracle/OracleNullStatement.java
@@ -9,11 +9,12 @@
  */
 package net.sf.jsqlparser.statement.oracle;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** A PL/SQL NULL statement, which deliberately performs no action. */
-public class OracleNullStatement implements Statement {
+public class OracleNullStatement extends ASTNodeAccessImpl implements Statement {
     @Override
     public <T, S> T accept(StatementVisitor<T> visitor, S context) {
         return visitor.visit(this, context);
diff --git a/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java b/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java
index ee3d2c44c2..849156e89f 100644
--- a/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/refresh/RefreshMaterializedViewStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.refresh;
 
 import java.util.function.Consumer;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -22,7 +23,7 @@
  * @author jxnu-liguobin
  */
 
-public class RefreshMaterializedViewStatement implements Statement {
+public class RefreshMaterializedViewStatement extends ASTNodeAccessImpl implements Statement {
 
     private Table view;
     private RefreshMode refreshMode;
diff --git a/src/main/java/net/sf/jsqlparser/statement/reindex/Reindex.java b/src/main/java/net/sf/jsqlparser/statement/reindex/Reindex.java
index 5402be1d84..29d5a179f9 100644
--- a/src/main/java/net/sf/jsqlparser/statement/reindex/Reindex.java
+++ b/src/main/java/net/sf/jsqlparser/statement/reindex/Reindex.java
@@ -15,12 +15,13 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
 /** A PostgreSQL {@code REINDEX} statement. */
-public class Reindex implements Statement {
+public class Reindex extends ASTNodeAccessImpl implements Statement {
 
     public enum Target {
         INDEX, TABLE, SCHEMA, DATABASE, SYSTEM
diff --git a/src/main/java/net/sf/jsqlparser/statement/role/AlterRole.java b/src/main/java/net/sf/jsqlparser/statement/role/AlterRole.java
index 27b4527825..040552d8a1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/role/AlterRole.java
+++ b/src/main/java/net/sf/jsqlparser/statement/role/AlterRole.java
@@ -14,6 +14,7 @@
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.ConfigurationParameterChange;
 import net.sf.jsqlparser.statement.ConfigurationParameterChange.ValueKind;
 import net.sf.jsqlparser.statement.Statement;
@@ -24,7 +25,7 @@
  * {@code RESET} actions use the shared {@link ConfigurationParameterChange}; the parameter
  * accessors of this class read and edit that change.
  */
-public class AlterRole implements Statement {
+public class AlterRole extends ASTNodeAccessImpl implements Statement {
     public enum Action {
         OPTIONS, RENAME, SET, RESET, ADD_USER, DROP_USER
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/role/CreateRole.java b/src/main/java/net/sf/jsqlparser/statement/role/CreateRole.java
index 13a557b865..2bf56d1a72 100644
--- a/src/main/java/net/sf/jsqlparser/statement/role/CreateRole.java
+++ b/src/main/java/net/sf/jsqlparser/statement/role/CreateRole.java
@@ -16,6 +16,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
@@ -25,7 +26,7 @@
  * MySQL's {@code CREATE ROLE [IF NOT EXISTS] role [, role] ...} keeps its account-style role names
  * in {@link #getRoles()} instead of {@link #getName()}.
  */
-public class CreateRole implements Statement {
+public class CreateRole extends ASTNodeAccessImpl implements Statement {
     public enum Command {
         ROLE, USER, GROUP
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/role/ReassignOwned.java b/src/main/java/net/sf/jsqlparser/statement/role/ReassignOwned.java
index 2ca93b73b1..906cd649a7 100644
--- a/src/main/java/net/sf/jsqlparser/statement/role/ReassignOwned.java
+++ b/src/main/java/net/sf/jsqlparser/statement/role/ReassignOwned.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.create.user.UserAccount;
@@ -22,7 +23,7 @@
  * PostgreSQL {@code REASSIGN OWNED BY old_role [, ...] TO new_role}. Roles use the same name model
  * as the roles of {@code DROP OWNED BY}.
  */
-public class ReassignOwned implements Statement {
+public class ReassignOwned extends ASTNodeAccessImpl implements Statement {
     private final List<UserAccount> roles = new ArrayList<>();
     private UserAccount newRole;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/securitylabel/SecurityLabel.java b/src/main/java/net/sf/jsqlparser/statement/securitylabel/SecurityLabel.java
index cc0b37592e..8d4988fd7a 100644
--- a/src/main/java/net/sf/jsqlparser/statement/securitylabel/SecurityLabel.java
+++ b/src/main/java/net/sf/jsqlparser/statement/securitylabel/SecurityLabel.java
@@ -13,6 +13,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.RoutineReference;
@@ -25,7 +26,7 @@
  * selects its object type and discards the previous target. A null label stands for
  * {@code IS NULL}, which removes the label.
  */
-public class SecurityLabel implements Statement {
+public class SecurityLabel extends ASTNodeAccessImpl implements Statement {
 
     public enum ObjectType {
         TABLE, COLUMN, AGGREGATE, DATABASE, DOMAIN, EVENT_TRIGGER, FOREIGN_TABLE, FUNCTION, LANGUAGE, LARGE_OBJECT, MATERIALIZED_VIEW, PROCEDURE, PUBLICATION, ROLE, ROUTINE, SCHEMA, SEQUENCE, SUBSCRIPTION, TABLESPACE, TYPE, VIEW;
diff --git a/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java b/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java
index 4662150fa5..f412066c83 100644
--- a/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/select/OrderByElement.java
@@ -9,12 +9,11 @@
  */
 package net.sf.jsqlparser.statement.select;
 
-import java.io.Serializable;
-
 import java.util.Locale;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
-public class OrderByElement implements Serializable {
+public class OrderByElement extends ASTNodeAccessImpl {
 
     private Expression expression;
     // postgres rollup is an ExpressionList
diff --git a/src/main/java/net/sf/jsqlparser/statement/show/ShowCreateStatement.java b/src/main/java/net/sf/jsqlparser/statement/show/ShowCreateStatement.java
index fa36ea1717..d124fc2301 100644
--- a/src/main/java/net/sf/jsqlparser/statement/show/ShowCreateStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/show/ShowCreateStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.show;
 
 import net.sf.jsqlparser.expression.StringValue;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -30,7 +31,7 @@
  * @see <a href="https://dev.mysql.com/doc/refman/8.4/en/show-create-table.html">MySQL SHOW CREATE
  *      TABLE</a>
  */
-public class ShowCreateStatement implements Statement {
+public class ShowCreateStatement extends ASTNodeAccessImpl implements Statement {
 
     public enum ObjectType {
         TABLE, VIEW, PROCEDURE, FUNCTION, TRIGGER, EVENT, DATABASE, USER;
diff --git a/src/main/java/net/sf/jsqlparser/statement/show/ShowIndexStatement.java b/src/main/java/net/sf/jsqlparser/statement/show/ShowIndexStatement.java
index d6b4bf72d8..3c9b10072d 100644
--- a/src/main/java/net/sf/jsqlparser/statement/show/ShowIndexStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/show/ShowIndexStatement.java
@@ -9,6 +9,7 @@
  */
 package net.sf.jsqlparser.statement.show;
 
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -16,7 +17,7 @@
  * @author Jayant Kumar Yadav
  */
 
-public class ShowIndexStatement implements Statement {
+public class ShowIndexStatement extends ASTNodeAccessImpl implements Statement {
 
     private String tableName;
 
diff --git a/src/main/java/net/sf/jsqlparser/statement/show/ShowTableStatusStatement.java b/src/main/java/net/sf/jsqlparser/statement/show/ShowTableStatusStatement.java
index d9a2385e84..a5126cf7ca 100644
--- a/src/main/java/net/sf/jsqlparser/statement/show/ShowTableStatusStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/show/ShowTableStatusStatement.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.show;
 
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 import net.sf.jsqlparser.statement.show.ShowTablesStatement.SelectionMode;
@@ -20,7 +21,7 @@
  * @see <a href="https://dev.mysql.com/doc/refman/8.4/en/show-table-status.html">MySQL SHOW TABLE
  *      STATUS</a>
  */
-public class ShowTableStatusStatement implements Statement {
+public class ShowTableStatusStatement extends ASTNodeAccessImpl implements Statement {
 
     private SelectionMode selectionMode = SelectionMode.FROM;
     private String dbName;
diff --git a/src/main/java/net/sf/jsqlparser/statement/show/ShowTablesStatement.java b/src/main/java/net/sf/jsqlparser/statement/show/ShowTablesStatement.java
index d6016d7fb9..7dbb97b479 100644
--- a/src/main/java/net/sf/jsqlparser/statement/show/ShowTablesStatement.java
+++ b/src/main/java/net/sf/jsqlparser/statement/show/ShowTablesStatement.java
@@ -11,6 +11,7 @@
 
 import java.util.Locale;
 import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
@@ -21,7 +22,7 @@
  *
  * @see <a href="https://dev.mysql.com/doc/refman/8.0/en/show-tables.html">MySQL show tables</a>
  */
-public class ShowTablesStatement implements Statement {
+public class ShowTablesStatement extends ASTNodeAccessImpl implements Statement {
 
     private EnumSet<Modifiers> modifiers;
     private SelectionMode selectionMode;
diff --git a/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java b/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java
index 81fc5cdddd..a046c7fce1 100644
--- a/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java
+++ b/src/main/java/net/sf/jsqlparser/statement/truncate/Truncate.java
@@ -12,13 +12,14 @@
 import java.util.AbstractList;
 import java.util.ArrayList;
 import java.util.List;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.schema.TableReference;
 import net.sf.jsqlparser.statement.CascadeBehavior;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
 
-public class Truncate implements Statement {
+public class Truncate extends ASTNodeAccessImpl implements Statement {
     public enum IdentityOption {
         RESTART, CONTINUE
     }
diff --git a/src/main/java/net/sf/jsqlparser/statement/update/Update.java b/src/main/java/net/sf/jsqlparser/statement/update/Update.java
index 8e17df515a..6351832276 100644
--- a/src/main/java/net/sf/jsqlparser/statement/update/Update.java
+++ b/src/main/java/net/sf/jsqlparser/statement/update/Update.java
@@ -12,6 +12,7 @@
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.OracleHint;
 import net.sf.jsqlparser.expression.PreferringClause;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.ForPortionClause;
@@ -37,7 +38,7 @@
 import java.util.Optional;
 
 @SuppressWarnings({"PMD.CyclomaticComplexity"})
-public class Update implements Statement {
+public class Update extends ASTNodeAccessImpl implements Statement {
 
     private List<WithItem<?>> withItemsList;
     private Table table;
diff --git a/src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java b/src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java
index c13397569d..f4a0492363 100644
--- a/src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java
+++ b/src/main/java/net/sf/jsqlparser/statement/upsert/Upsert.java
@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.statement.upsert;
 
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
@@ -27,7 +28,7 @@
 import java.util.List;
 import java.util.Optional;
 
-public class Upsert implements Statement {
+public class Upsert extends ASTNodeAccessImpl implements Statement {
 
     private Table table;
     private ExpressionList<Column> columns;
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
index 3d12e99f96..a361fa20f4 100644
--- a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
+++ b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -293,12 +293,94 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
      */
     private void linkAST(ASTNodeAccess access, Node node, Expression leftExpression) {
         linkAST(access, node);
-        if (leftExpression instanceof ASTNodeAccess) {
-            Node leftNode = ((ASTNodeAccess) leftExpression).getASTNode();
-            if (leftNode != null && leftNode.jjtGetFirstToken() != null) {
-                node.jjtSetFirstToken(leftNode.jjtGetFirstToken());
+        node.jjtSetFirstToken(firstToken(leftExpression, node.jjtGetFirstToken()));
+    }
+
+    /**
+     * Links an object no production opens a node for to a {@link RangeNode} spanning its tokens
+     * from {@code first} to the last one consumed.
+     */
+    private void linkAST(ASTNodeAccess access, Token first) {
+        linkAST(access, first, getToken(0));
+    }
+
+    private void linkAST(ASTNodeAccess access, Token first, Token last) {
+        linkAST(access, new RangeNode(first, last, null));
+    }
+
+    private static Token firstToken(ASTNodeAccess operand, Token fallback) {
+        Node node = operand == null ? null : operand.getASTNode();
+        return node != null && node.jjtGetFirstToken() != null ? node.jjtGetFirstToken() : fallback;
+    }
+
+    /** Links a list the grammar assembles itself to the range from its first element to its last. */
+    private <T extends ExpressionList<?>> T linkElements(T list) {
+        if (list != null && !list.isEmpty() && list.getASTNode() == null) {
+            Node first = list.get(0).getASTNode();
+            Node last = list.get(list.size() - 1).getASTNode();
+            if (first != null && last != null) {
+                linkAST(list, first.jjtGetFirstToken(), last.jjtGetLastToken());
             }
         }
+        return list;
+    }
+
+    /** Links an object built from the single token just consumed, such as a name, to that token. */
+    private <T extends ASTNodeAccess> T linkToLastToken(T access) {
+        linkAST(access, getToken(0), getToken(0));
+        return access;
+    }
+
+    private <T extends ASTNodeAccess> T linked(T access, Token first) {
+        linkAST(access, first);
+        return access;
+    }
+
+    /**
+     * Widens an object's range to text it has taken in beyond its node, from {@code first} or to
+     * {@code last} where given. A tree node keeps its own range, and the object moves to a
+     * {@link RangeNode} over the wider one.
+     */
+    private void widen(Object access, Token first, Token last) {
+        Node node = access instanceof ASTNodeAccess ? ((ASTNodeAccess) access).getASTNode() : null;
+        if (node == null) {
+            return;
+        }
+        Token from = first != null ? first : node.jjtGetFirstToken();
+        Token to = last != null ? last : node.jjtGetLastToken();
+        if (node instanceof RangeNode) {
+            node.jjtSetFirstToken(from);
+            node.jjtSetLastToken(to);
+        } else {
+            linkAST((ASTNodeAccess) access, new RangeNode(from, to, node));
+        }
+    }
+
+    /** Links a statement that no other rule linked to the range from {@code first} on. */
+    private void linkStatement(Statement statement, Token first) {
+        if (statement instanceof ASTNodeAccess) {
+            linkASTIfMissing((ASTNodeAccess) statement, first);
+        }
+    }
+
+    /**
+     * The last token of the qualifier in a dotted name running from {@code first} to {@code name},
+     * which is the token two before {@code name}. Null when the name has no qualifier.
+     */
+    private static Token qualifierLast(Token first, Token name) {
+        for (Token token = first; token != null && token != name; token = token.next) {
+            if (token.next != null && token.next.next == name) {
+                return token;
+            }
+        }
+        return null;
+    }
+
+    /** Like {@link #linkAST(ASTNodeAccess, Token)}, for an object a production may already have linked. */
+    private void linkASTIfMissing(ASTNodeAccess access, Token first) {
+        if (access != null && access.getASTNode() == null) {
+            linkAST(access, first);
+        }
     }
 
     public Node getASTRoot() {
@@ -935,7 +1017,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
      * Handles OR (prec=2), XOR (prec=3 under MySQL, else 2), AND/&& (prec=4).
      * Safe to use now that no syntactic production LOOKAHEADs scan through expressions.
      */
-    protected Expression prattExpressionRest(Expression left, int minPrec) throws ParseException {
+    protected Expression prattExpressionRest(Expression left, Token first, int minPrec) throws ParseException {
         while (!interrupted) {
             Token t = getToken(1);
             int op = t.kind;
@@ -958,7 +1040,8 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
                 Expression thenExpression;
                 ternaryThenBranchDepth++;
                 try {
-                    thenExpression = prattExpressionRest(Condition(), 2);
+                    Token thenFirst = getToken(1);
+                    thenExpression = prattExpressionRest(Condition(), thenFirst, 2);
                 } finally {
                     ternaryThenBranchDepth--;
                 }
@@ -966,13 +1049,16 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
                     throw new ParseException("Expected ':' closing the ternary conditional operator");
                 }
                 jj_consume_token(getToken(1).kind, getToken(1).image);
-                Expression elseExpression = prattExpressionRest(Condition(), 2);
+                Token elseFirst = getToken(1);
+                Expression elseExpression = prattExpressionRest(Condition(), elseFirst, 2);
                 left = new TernaryExpression(left, thenExpression, elseExpression);
+                linkAST(left, first);
                 continue;
             }
             jj_consume_token(op, getToken(1).image);
             // +1 makes OR/AND/XOR left-associative
-            Expression right = prattExpressionRest(Condition(), prec + 1);
+            Token rightFirst = getToken(1);
+            Expression right = prattExpressionRest(Condition(), rightFirst, prec + 1);
             if (op == K_AND) {
                 left = new AndExpression(left, right);
             } else if (op == OP_DOUBLEAND) {
@@ -983,6 +1069,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
             } else {
                 left = new OrExpression(left, right);
             }
+            linkAST(left, first);
         }
         return left;
     }
@@ -1002,7 +1089,7 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
         return kind == K_RETURNING || kind == K_ABSENT && getToken(2).kind == K_ON;
     }
 
-        protected Expression prattArithRest(Expression left, int minPrec) throws ParseException {
+        protected Expression prattArithRest(Expression left, Token first, int minPrec) throws ParseException {
         while (!interrupted) {
             Token t = getToken(1);
             int op = t.kind;
@@ -1051,13 +1138,18 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
             if (op == OP_PIPE && getToken(2).kind == OP_PIPE) {
                 jj_consume_token(OP_PIPE, getToken(1).image);
                 jj_consume_token(OP_PIPE, getToken(1).image);
-                Expression right = prattArithRest(PrimaryExpression(), prec + 1);
+                Token rightFirst = getToken(1);
+                Expression right = prattArithRest(PrimaryExpression(), rightFirst, prec + 1);
                 Concat r = new Concat(); r.setLeftExpression(left); r.setRightExpression(right); left = r;
+                linkAST(left, first);
                 continue;
             }
 
             jj_consume_token(op, getToken(1).image);
-            Expression right = prattArithRest(PrimaryExpression(), prec + 1);
+            Token rightFirst = getToken(1);
+            Expression right = prattArithRest(PrimaryExpression(), rightFirst, prec + 1);
+            // a JSON access chain extends the JsonExpression it started, which already has a node
+            boolean extended = jsonAccess && left instanceof JsonExpression;
 
             if (jsonAccess) {
                 JsonExpression access = left instanceof JsonExpression
@@ -1087,6 +1179,11 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
                 else if ("&".equals(img)) { BitwiseAnd     r = new BitwiseAnd();     r.setLeftExpression(left); r.setRightExpression(right); left = r; }
                 else if ("<->".equals(img) || "<#>".equals(img)) { GeometryDistance r = new GeometryDistance(img); r.setLeftExpression(left); r.setRightExpression(right); left = r; }
             }
+            if (extended) {
+                widen(left, first, getToken(0));
+            } else {
+                linkAST(left, first);
+            }
         }
         return left;
     }
@@ -3466,6 +3563,12 @@ public class CCJSqlParser extends AbstractJSqlParser<CCJSqlParser> {
      * PostgreSQL escape string with a Unicode escape that the server rejects is rejected as well.
      */
     private StringValue stringValue(Token token) throws ParseException {
+        StringValue value = unlinkedStringValue(token);
+        linkAST(value, token, token);
+        return value;
+    }
+
+    private StringValue unlinkedStringValue(Token token) throws ParseException {
         StringValue value = new StringValue(token.image);
         // a U&'...' string brings its own escaping
         if (value.getQuoteStr() == null || value.getQuoteStr().startsWith("$")
@@ -3692,6 +3795,8 @@ TOKEN_MGR_DECLS : {
 	{
 		t.absoluteBegin = getCurrentTokenAbsolutePosition();
 		t.absoluteEnd = t.absoluteBegin + t.image.length();
+        positionComments(t);
+        lastToken = t;
         // Track the lexical region independently of parser lookahead: nested SELECT
         // disambiguation can fetch PATTERN tokens before its production is entered.
         if (rowPatternContext == null && t.kind == S_IDENTIFIER
@@ -3705,6 +3810,26 @@ TOKEN_MGR_DECLS : {
         }
 	}
 
+    // the last token handed out with a token action, whose successor is the first end-of-file token
+    private Token lastToken;
+
+    /**
+     * Gives the comments before the end of input their positions. The end-of-file token gets no
+     * token action, and it is the first one after the last token that does which holds them.
+     */
+    public void positionTrailingComments() {
+        if (lastToken != null && lastToken.next != null && lastToken.next.kind == EOF) {
+            positionComments(lastToken.next);
+        }
+    }
+
+    /** Gives the comments in front of a token their positions. */
+    public void positionComments(Token t) {
+        if (input_stream instanceof SimpleCharStream) {
+            ((SimpleCharStream) input_stream).positionSpecialTokens(t);
+        }
+    }
+
 	public int getCurrentTokenAbsolutePosition()
 	{
 		if (input_stream instanceof SimpleCharStream)
@@ -4766,16 +4891,17 @@ Statement Statement() #Statement:
     Statement stm = null;
     Statement stm2 = null;
     Expression condition;
+    Token ifFirst = null;
 }
 {
     (
          try {
             (
-                 <K_IF> condition=Condition()
-                 ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); }
+                 <K_IF> { ifFirst = getToken(0); } condition=Condition()
+                 ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); linkAST(ifElseStatement, ifFirst); }
                  [ LOOKAHEAD(2)
                      [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForIfStatement(true); } ]
-                     <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2);  }
+                     <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2); widen(ifElseStatement, null, getToken(0)); }
                  ]
 
                  [
@@ -4784,6 +4910,7 @@ Statement Statement() #Statement:
                            ifElseStatement.setUsingSemicolonForElseStatement(true);
                         else if (ifElseStatement!=null)
                            ifElseStatement.setUsingSemicolonForIfStatement(true);
+                       widen(ifElseStatement, null, getToken(0));
                      }
                  ]
                  <EOF>
@@ -4812,6 +4939,7 @@ Statement Statement() #Statement:
     )
 
 	{
+		token_source.positionTrailingComments();
 		return ifElseStatement!=null ? ifElseStatement : stm;
 	}
 }
@@ -4820,6 +4948,7 @@ Statement SingleStatement() :
 {
     Statement stm = null;
     List<WithItem<?>> with = null;
+    Token first = getToken(1);
 }
 {
         (
@@ -4841,7 +4970,7 @@ Statement SingleStatement() :
            LOOKAHEAD(3) (
                 [ LOOKAHEAD(2) with=WithList() ]
                 (
-                    stm = SelectWithWithItems( with )
+                    stm = SelectWithWithItems( with ) { if (with != null) { widen(stm, first, null); } }
                     |
                     stm = InsertWithWithItems( with )
                     |
@@ -4993,7 +5122,10 @@ Statement SingleStatement() :
             |
             LOOKAHEAD({ Dialect.EXASOL.name().equals(getAsString(Feature.dialect)) }) ( stm = Import() | stm = Export() )
         )
-        { return stm; }
+        {
+            linkStatement(stm, first);
+            return stm;
+        }
 }
 
 OracleBlock OracleBlock():
@@ -5042,7 +5174,7 @@ Statements OracleBlockStatements():
 }
 
 Statement OracleBlockStatement():
-{ Statement statement; Expression target; Expression value; }
+{ Statement statement; Expression target; Expression value; Token first = getToken(1); }
 {
     (
         LOOKAHEAD({ getToken(1).kind == K_DECLARE || getToken(1).kind == K_BEGIN }) statement=OracleBlock()
@@ -5055,7 +5187,7 @@ Statement OracleBlockStatement():
           statement=OracleImplicitCall()
         | statement=SingleStatement()
     )
-    { return statement; }
+    { linkStatement(statement, first); return statement; }
 }
 
 Execute OracleImplicitCall():
@@ -5101,7 +5233,7 @@ Block Block() #Block : {
 }
 {
     block = BeginEndBlock()
-    [LOOKAHEAD(2) <ST_SEMICOLON> { block.setSemicolonAfterEnd(true); } ]
+    [LOOKAHEAD(2) <ST_SEMICOLON> { block.setSemicolonAfterEnd(true); widen(block, null, getToken(0)); } ]
     {
         return block;
     }
@@ -5113,6 +5245,7 @@ Block BeginEndBlock(): {
     List<Statement> list = new ArrayList<Statement>();
     Statement stm;
     Block block = new Block();
+    Token first = getToken(1);
 }
 {
     <K_BEGIN>
@@ -5142,6 +5275,7 @@ Block BeginEndBlock(): {
 
     <K_END>
     {
+        linkAST(block, first);
         return block;
     }
 }
@@ -5151,6 +5285,7 @@ Statements Statements() #Statements: {
     IfElseStatement ifElseStatement = null;
     Statement stm = null;
     Statement stm2 = null;
+    Token ifFirst = null;
     Expression condition;
 }
 {
@@ -5178,11 +5313,11 @@ Statements Statements() #Statements: {
 
              try {
                 (
-                     <K_IF> condition=Condition()
-                     ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); }
+                     <K_IF> { ifFirst = getToken(0); } condition=Condition()
+                     ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); linkAST(ifElseStatement, ifFirst); }
                      [ LOOKAHEAD(2)
                          [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForIfStatement(true); } ]
-                         <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2);  }
+                         <K_ELSE> ( stm2 = SingleStatement() |  stm2 =  Block() ) {  ifElseStatement.setElseStatement(stm2); widen(ifElseStatement, null, getToken(0)); }
                      ]
 
                      { requireStatementBoundary(); stmts.add( ifElseStatement ); }
@@ -5193,6 +5328,7 @@ Statements Statements() #Statements: {
                                ifElseStatement.setUsingSemicolonForElseStatement(true);
                             else if (ifElseStatement!=null)
                                ifElseStatement.setUsingSemicolonForIfStatement(true);
+                           widen(ifElseStatement, null, getToken(0));
                          }
                      ]
                 )
@@ -5230,11 +5366,11 @@ Statements Statements() #Statements: {
             }
             try {
                 (
-                    <K_IF> condition=Condition()
-                    ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); }
+                    <K_IF> { ifFirst = getToken(0); } condition=Condition()
+                    ( stm = SingleStatement() | stm = Block() ) {  ifElseStatement = new IfElseStatement(condition, stm); linkAST(ifElseStatement, ifFirst); }
                     [ LOOKAHEAD(2)
                         [ <ST_SEMICOLON> { ifElseStatement.setUsingSemicolonForIfStatement(true); } ]
-                        <K_ELSE> ( stm2 = SingleStatement() | stm2 = Block() ) {  ifElseStatement.setElseStatement(stm2);  }
+                        <K_ELSE> ( stm2 = SingleStatement() | stm2 = Block() ) {  ifElseStatement.setElseStatement(stm2); widen(ifElseStatement, null, getToken(0)); }
                     ]
 
                     { requireStatementBoundary(); stmts.add( ifElseStatement ); }
@@ -5258,6 +5394,7 @@ Statements Statements() #Statements: {
                              ifElseStatement.setUsingSemicolonForElseStatement(true);
                           else if (ifElseStatement!=null)
                              ifElseStatement.setUsingSemicolonForIfStatement(true);
+                         widen(ifElseStatement, null, getToken(0));
              } )*
 
         )*
@@ -5276,6 +5413,7 @@ Statements Statements() #Statements: {
 
     <EOF>
     {
+        token_source.positionTrailingComments();
         return stmts;
     }
 }
@@ -5290,7 +5428,9 @@ UnsupportedStatement captureStatementTokens(Token statementStart) {
             break;
         }
     }
-    return new UnsupportedStatement(tokenImages);
+    UnsupportedStatement statement = new UnsupportedStatement(tokenImages);
+    linkAST(statement, statementStart.next, statementEnd);
+    return statement;
 }
 
 JAVACODE
@@ -6370,7 +6510,7 @@ SetStatement SetAssignments(): {
     (
         ","
         ( LOOKAHEAD(3) SetAssignment(set)
-          | exp=Expression() { set.getExpressions(set.getCount() - 1).add(exp); } )
+          | exp=Expression() { set.getExpressions(set.getCount() - 1).add(exp); widen(set.getExpressions(set.getCount() - 1), null, getToken(0)); } )
     )*
     { return set; }
 }
@@ -6402,7 +6542,7 @@ void SetAssignment(SetStatement set):
                 && (name instanceof UserVariable || "Time Zone".equals(name))) {
             throw new ParseException("SET TO requires a configuration parameter name");
         }
-        set.add(name, new ExpressionList<Expression>(expression), operator);
+        set.add(name, linkElements(new ExpressionList<Expression>(expression)), operator);
     }
     )
     {
@@ -6423,7 +6563,7 @@ Expression SetAssignmentValue():
 }
 {
     ( LOOKAHEAD({ getToken(1).kind == K_ON && getToken(0).kind == K_TO })
-      value=<K_ON> { expression = new Column(value.image); }
+      value=<K_ON> { expression = linkToLastToken(new Column(value.image)); }
       | expression=Expression() )
     { return expression; }
 }
@@ -6440,8 +6580,8 @@ void SetCharacterSet(SetStatement set):
       | <S_IDENTIFIER> { name = "CHARSET"; } )
     ( value=<S_CHAR_LITERAL> { expression = stringValue(value); }
       | (value=<S_IDENTIFIER> | value=<S_QUOTED_IDENTIFIER> | value=<K_DEFAULT>)
-        { expression = new Column(value.image); } )
-    { set.add(name, new ExpressionList<Expression>(expression), false); }
+        { expression = linkToLastToken(new Column(value.image)); } )
+    { set.add(name, linkElements(new ExpressionList<Expression>(expression)), false); }
 }
 
 SetStatement SqlServerSetOnOffOptions(): {
@@ -6658,7 +6798,7 @@ PrepareStatement PrepareStatement() #PrepareStatement:
 ColDataType PrepareParameterType():
 { ColDataType type; Token token; }
 {
-    ( token=<K_UNKNOWN> { type = new ColDataType(token.image); }
+    ( token=<K_UNKNOWN> { type = linkToLastToken(new ColDataType(token.image)); }
       | type=ColDataType() )
     { return type; }
 }
@@ -6994,6 +7134,7 @@ ExplainStatement Explain():
     List<ExplainStatement.Option> options;
     ExplainStatement es;
     boolean parenthesized = false;
+    Token statementFirst;
 }
 {
     ( tk=<K_EXPLAIN> | tk = <K_SUMMARIZE> )
@@ -7003,10 +7144,11 @@ ExplainStatement Explain():
                 LOOKAHEAD(2) "(" options = PostgresqlExplainOptions() ")" { parenthesized = true; }
                 | options = ExplainStatementOptions()
             )
+            { statementFirst = getToken(1); }
             (
                 [ LOOKAHEAD(2) with=WithList() ]
                 (
-                    statement = SelectWithWithItems( with )
+                    statement = SelectWithWithItems( with ) { if (with != null) { widen(statement, statementFirst, null); } }
                     | statement = InsertWithWithItems( with )
                     | statement = UpdateWithWithItems( with )
                     | statement = DeleteWithWithItems( with )
@@ -7014,6 +7156,7 @@ ExplainStatement Explain():
                 )
             )
             {
+                linkStatement(statement, statementFirst);
                 es = new ExplainStatement(tk.image, statement, options);
                 es.setParenthesizedOptions(parenthesized);
             }
@@ -7340,7 +7483,7 @@ ShowCreateStatement ShowCreate(): {
         <K_USER> { statement.setObjectType(ShowCreateStatement.ObjectType.USER); }
         (
             LOOKAHEAD({ isKeywordAhead("CURRENT_USER") }) currentUser = RelObjectName()
-            { account.setUser(new StringValue(currentUser).setQuoteStr("")); }
+            { account.setUser(linkToLastToken(new StringValue(currentUser).setQuoteStr(""))); }
             [ LOOKAHEAD(2) "(" ")" { statement.setCurrentUserParentheses(true); } ]
             |
             account = MySqlAccountName()
@@ -7423,12 +7566,15 @@ ShowTablesStatement ShowTables(): {
 
 Values Values(): {
     ExpressionList expressions;
+    Token first = getToken(1);
 } {
     ( <K_VALUES> | <K_VALUE> )
     expressions = ExpressionList()
 
     {
-        return new Values(expressions);
+        Values values = new Values(expressions);
+        linkAST(values, first);
+        return values;
     }
 }
 
@@ -7634,7 +7780,12 @@ List<UpdateSet> UpdateSets():
     (
         (
             tableColumn=Column() "=" valueExpression=Expression()
-            { updateSets.add( new UpdateSet (tableColumn, valueExpression)); }
+            {
+                updateSet = new UpdateSet(tableColumn, valueExpression);
+                linkElements(updateSet.getColumns());
+                linkElements(updateSet.getValues());
+                updateSets.add(updateSet);
+            }
         )
         |
         (
@@ -7642,7 +7793,7 @@ List<UpdateSet> UpdateSets():
             columns = ParenthesedExpressionList() { updateSet.setColumns(columns); }
             "="
             (
-                LOOKAHEAD(3) valueExpression = ParenthesedSelect() { updateSet.setValues( new ExpressionList(valueExpression)); }
+                LOOKAHEAD(3) valueExpression = ParenthesedSelect() { updateSet.setValues(linkElements(new ExpressionList(valueExpression))); }
                 |
                 values = ParenthesedExpressionList() { updateSet.setValues(values); }
             )
@@ -7652,14 +7803,19 @@ List<UpdateSet> UpdateSets():
     (
         LOOKAHEAD(2) "," (
             tableColumn=Column() "=" valueExpression=Expression()
-            { updateSets.add( new UpdateSet (tableColumn, valueExpression)); }
+            {
+                updateSet = new UpdateSet(tableColumn, valueExpression);
+                linkElements(updateSet.getColumns());
+                linkElements(updateSet.getValues());
+                updateSets.add(updateSet);
+            }
             |
             (
                 { updateSet = new UpdateSet(); updateSets.add(updateSet); }
                 columns = ParenthesedExpressionList() { updateSet.setColumns(columns); }
                 "="
                 (
-                    LOOKAHEAD(3) valueExpression = ParenthesedSelect() { updateSet.setValues( new ExpressionList(valueExpression)); }
+                    LOOKAHEAD(3) valueExpression = ParenthesedSelect() { updateSet.setValues(linkElements(new ExpressionList(valueExpression))); }
                     |
                     values = ParenthesedExpressionList() { updateSet.setValues(values); }
                 )
@@ -7759,11 +7915,13 @@ InsertBulk.Option InsertBulkOption():
             option.getOrderByElements().add(order);
         }
         [ (direction=<K_ASC> | direction=<K_DESC>) { order.setAsc(direction.kind == K_ASC); order.setAscDescPresent(true); } ]
+        { linkAST(order, firstToken(column, getToken(0))); }
         ( "," column=Column() {
             order = new OrderByElement().withExpression(column);
             option.getOrderByElements().add(order);
           }
           [ (direction=<K_ASC> | direction=<K_DESC>) { order.setAsc(direction.kind == K_ASC); order.setAscDescPresent(true); } ]
+          { linkAST(order, firstToken(column, getToken(0))); }
         )* ")"
         |
         LOOKAHEAD({ isKeywordAhead("ROWS_PER_BATCH") }) AccessKeyword("ROWS_PER_BATCH") "=" value=<S_LONG>
@@ -8345,17 +8503,22 @@ MergeInsert MergeInsertClause(Expression predicate) : {
     ExpressionList<Column> columns;
     ExpressionList expList;
     Expression condition;
+    Token open;
 }
 {
     <K_INSERT>
-    [ "(" columns = ColumnList() ")"
+    [ open="(" columns = ColumnList() ")"
         {
-            mi.setColumns( new ParenthesedExpressionList<Column>(columns) );
+            ParenthesedExpressionList<Column> insertColumns = new ParenthesedExpressionList<Column>(columns);
+            linkAST(insertColumns, open);
+            mi.setColumns(insertColumns);
         }
     ]
-    <K_VALUES> "(" expList = SimpleExpressionList() ")"
+    <K_VALUES> open="(" expList = SimpleExpressionList() ")"
     {
-        mi.setValues( new ParenthesedExpressionList(expList) );
+        ParenthesedExpressionList insertValues = new ParenthesedExpressionList(expList);
+        linkAST(insertValues, open);
+        mi.setValues(insertValues);
     }
 
     [ <K_WHERE> condition = Expression() { mi.setWhereCondition(condition); } ]
@@ -8441,12 +8604,14 @@ Column Column() #Column :
     ObjectNames data = null;
     ArrayConstructor arrayConstructor = null;
     Token tk = null;
+    Token first = getToken(1);
+    Token name;
 }
 {
-    data = ColumnIdentifier()
+    data = ColumnIdentifier() { name = getToken(0); }
     [ LOOKAHEAD(2) <K_COMMENT> tk=<S_CHAR_LITERAL> ]
     // @todo: we better should return a SEQUENCE instead of a COLUMN
-    [  LOOKAHEAD(2) "." <K_NEXTVAL> { data.getNames().add("nextval"); } ]
+    [  LOOKAHEAD(2) "." <K_NEXTVAL> { data.getNames().add("nextval"); name = getToken(0); } ]
 
     [ LOOKAHEAD(2) arrayConstructor = Subscript() ]
     {
@@ -8455,6 +8620,10 @@ Column Column() #Column :
         if (arrayConstructor!=null) {
             col.setArrayConstructor(arrayConstructor);
         }
+        Token qualifierLast = qualifierLast(first, name);
+        if (col.getTable() != null && qualifierLast != null) {
+            linkAST(col.getTable(), first, qualifierLast);
+        }
         linkAST(col,jjtThis);
         return col;
     }
@@ -9246,13 +9415,15 @@ ParenthesedInsert ParenthesedInsert() #ParenthesedInsert:
 {
     ParenthesedInsert parenthesedInsert = new ParenthesedInsert();
     Insert insert;
+    Token open = getToken(1);
+    Token statementFirst;
 }
 {
-    "("
-    insert = Insert()
+    "(" { statementFirst = getToken(1); }
+    insert = Insert() { linkStatement(insert, statementFirst); }
     ")"
     {
-        return parenthesedInsert.withInsert(insert);
+        return linked(parenthesedInsert.withInsert(insert), open);
     }
 }
 
@@ -9260,13 +9431,15 @@ ParenthesedUpdate ParenthesedUpdate() #ParenthesedUpdate:
 {
     ParenthesedUpdate parenthesedUpdate = new ParenthesedUpdate();
     Update update;
+    Token open = getToken(1);
+    Token statementFirst;
 }
 {
-    "("
-    update = Update()
+    "(" { statementFirst = getToken(1); }
+    update = Update() { linkStatement(update, statementFirst); }
     ")"
     {
-        return parenthesedUpdate.withUpdate(update);
+        return linked(parenthesedUpdate.withUpdate(update), open);
     }
 }
 
@@ -9274,13 +9447,15 @@ ParenthesedDelete ParenthesedDelete() #ParenthesedDelete:
 {
     ParenthesedDelete parenthesedDelete = new ParenthesedDelete();
     Delete delete;
+    Token open = getToken(1);
+    Token statementFirst;
 }
 {
-    "("
-    delete = Delete()
+    "(" { statementFirst = getToken(1); }
+    delete = Delete() { linkStatement(delete, statementFirst); }
     ")"
     {
-        return parenthesedDelete.withDelete(delete);
+        return linked(parenthesedDelete.withDelete(delete), open);
     }
 }
 
@@ -9477,6 +9652,7 @@ PlainSelect PlainSelect() #PlainSelect:
     OracleHierarchicalExpression oracleHierarchicalQueryClause = null;
     PreferringClause preferringClause = null;
     ExpressionList expressionList = null;
+    Token partitionFirst = null;
     List<Table> intoTables = null;
     MySqlSelectIntoClause mySqlSelectIntoClause = null;
     MySqlProcedureAnalyse mySqlProcedureAnalyse = null;
@@ -9581,10 +9757,11 @@ PlainSelect PlainSelect() #PlainSelect:
     [ LOOKAHEAD(2) where=WhereClause() { plainSelect.setWhere(where); }]
     [ LOOKAHEAD(2) oracleHierarchicalQueryClause=OracleHierarchicalQueryClause() { plainSelect.setOracleHierarchical(oracleHierarchicalQueryClause); } ]
     [ LOOKAHEAD(2) preferringClause=PreferringClause() { plainSelect.setPreferringClause(preferringClause); }
-        [LOOKAHEAD(2) <K_PARTITION> <K_BY>
+        [LOOKAHEAD(2) partitionFirst=<K_PARTITION> <K_BY>
             expressionList=ComplexExpressionList()
             {
                 preferringClause.setPartitionExpressionList(expressionList, false);
+                linkAST(preferringClause.getPartitionBy(), partitionFirst);
             }
         ]
     ]
@@ -9614,7 +9791,7 @@ PlainSelect PlainSelect() #PlainSelect:
     // expression avoids a numeric LOOKAHEAD, which cannot see past a long parenthesized
     // subquery and would wrongly commit to LIMIT BY (issue #2359).
     [ LOOKAHEAD(1, <K_LIMIT>) limit = LimitWithOffset()
-        [ LOOKAHEAD(1, <K_BY>) <K_BY> expressionList = ExpressionList() { limit.setByExpressions(expressionList); } ]
+        [ LOOKAHEAD(1, <K_BY>) <K_BY> expressionList = ExpressionList() { limit.setByExpressions(expressionList); widen(limit, null, getToken(0)); } ]
         {
             if (limit.getByExpressions() != null) {
                 plainSelect.setLimitBy(limit);
@@ -9875,6 +10052,7 @@ Expression WithItemExpression():
 {
     LambdaExpression lambdaExpression;
     Expression expr;
+    Token open;
 }
 {
     (
@@ -9888,8 +10066,8 @@ Expression WithItemExpression():
         |
         // whole lambda wrapped in parentheses, e.g. (x -> x * 2)
         LOOKAHEAD( "(" ( RelObjectName() | ParenthesedColumnList() ) "->" )
-        "(" lambdaExpression = LambdaExpression() ")"
-        { expr = new ParenthesedExpressionList<Expression>(lambdaExpression); }
+        open="(" lambdaExpression = LambdaExpression() ")"
+        { expr = new ParenthesedExpressionList<Expression>(lambdaExpression); linkAST(expr, open); }
         |
         expr = Expression()
     )
@@ -9913,6 +10091,7 @@ WithSearchClause WithSearchClause() #WithSearchClause:
     <K_SET>
     sequenceColumnName = RelObjectName()
     {
+        linkElements(searchColumns);
         return new WithSearchClause(
                 "BREADTH".equalsIgnoreCase(orderingToken.image)
                         ? WithSearchClause.SearchOrder.BREADTH
@@ -9930,8 +10109,9 @@ WithCycleClause WithCycleClause() #WithCycleClause:
 }
 {
     <K_CYCLE>
-    name=RelObjectName() { columns.add(createColumn(name)); }
-    ( "," name=RelObjectName() { columns.add(createColumn(name)); } )*
+    name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); }
+    ( "," name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); } )*
+    { linkElements(columns); }
     <K_SET> name=RelObjectName() { cycle.setMarkColumnName(name); }
     [ <K_TO> value=Expression() { cycle.setMarkValue(value); }
       <K_DEFAULT> value=Expression() { cycle.setMarkDefault(value); } ]
@@ -10096,14 +10276,16 @@ Expression SelectItemExpression() #ColumnsExpression(transformers != null):
     Expression expression;
     ColumnsTransformer transformer;
     List<ColumnsTransformer> transformers = null;
+    Token first;
 }
 {
     // @fixme: Oracle's SEQUENCE.nextval is parsed as COLUMN with a name part nextval
     // @todo: parse a proper SEQUENCE instead of a COLUMN
+    { first = getToken(1); }
     (
-        LOOKAHEAD({ isPriorOperatorAhead() }) expression = ConnectByPriorOperator()
+        LOOKAHEAD({ isPriorOperatorAhead() }) expression = ConnectByPriorOperator() { linkASTIfMissing(expression, first); }
         |
-        ( expression = Condition() { expression = prattExpressionRest(expression, 2); } )
+        ( expression = Condition() { expression = prattExpressionRest(expression, first, 2); } )
     )
     (
         LOOKAHEAD( <K_APPLY> "(" | <K_REPLACE> [ <K_STRICT> ] "("
@@ -10154,6 +10336,7 @@ ColumnsTransformer ColumnsTransformer():
     ColumnsTransformer transformer;
     Token tk;
     boolean strict;
+    Token first = getToken(1);
 }
 {
     (
@@ -10190,7 +10373,7 @@ ColumnsTransformer ColumnsTransformer():
               |
               column = Column()
               {
-                  exceptColumns = new ParenthesedExpressionList<Column>(column);
+                  exceptColumns = linkElements(new ParenthesedExpressionList<Column>(column));
                   transformer.setParenthesized(false);
               }
           )
@@ -10231,7 +10414,7 @@ ColumnsTransformer ColumnsTransformer():
           )
           { transformer.setRenameItems(replaceItems); }
     )
-    { return transformer; }
+    { linkAST(transformer, first); return transformer; }
 }
 
 /**
@@ -10407,11 +10590,16 @@ SelectItem<Function> FunctionItem():
 {
     Alias alias = null;
     Function function;
+    Token first = getToken(1);
 }
 {
     function=Function()
     [ LOOKAHEAD({ isAliasAhead() }) alias=Alias() ]
-    { return new SelectItem<Function>(function, alias); }
+    {
+        SelectItem<Function> item = new SelectItem<Function>(function, alias);
+        linkAST(item, first);
+        return item;
+    }
 }
 
 ExpressionList<Column> PivotForColumns():
@@ -10423,7 +10611,7 @@ ExpressionList<Column> PivotForColumns():
     (
         columns = ParenthesedColumnList()
         |
-        column = Column() { columns = new ExpressionList<Column>(column); }
+        column = Column() { columns = linkElements(new ExpressionList<Column>(column)); }
     )
     { return columns; }
 }
@@ -10496,11 +10684,16 @@ SelectItem<ExpressionList<?>> ExpressionListItem():
 {
     ExpressionList expressionList;
     Alias alias = null;
+    Token first = getToken(1);
 }
 {
     expressionList=ParenthesedExpressionList()
     [ LOOKAHEAD({ isAliasAhead() }) alias=Alias() ]
-    { return new SelectItem<ExpressionList<?>>(expressionList, alias); }
+    {
+        SelectItem<ExpressionList<?>> item = new SelectItem<ExpressionList<?>>(expressionList, alias);
+        linkAST(item, first);
+        return item;
+    }
 }
 
 List<SelectItem<ExpressionList<?>>> PivotMultiInItems():
@@ -10635,7 +10828,7 @@ MySqlSelectIntoClause MySqlSelectIntoClause(MySqlSelectIntoClause.Position posit
           // Same shape as IntoClause() above: a PlainSelect can be followed by "," (subselect in
           // an expression list), so the repetition needs two tokens to decide.
           ( LOOKAHEAD(2) "," variable=MySqlIntoVariable() { variables.add(variable); } )*
-          { intoClause.setType(MySqlSelectIntoClause.Type.VARIABLES); intoClause.setVariables(variables); }
+          { intoClause.setType(MySqlSelectIntoClause.Type.VARIABLES); intoClause.setVariables(linkElements(variables)); }
     )
     {
         return intoClause;
@@ -10662,6 +10855,7 @@ MySqlProcedureAnalyse MySqlProcedureAnalyse():
     MySqlProcedureAnalyse procedureAnalyse = new MySqlProcedureAnalyse();
     Token maxElements = null;
     Token maxMemory = null;
+    Token first = getToken(1);
 }
 {
     <K_PROCEDURE> <K_ANALYSE> "("
@@ -10673,10 +10867,13 @@ MySqlProcedureAnalyse MySqlProcedureAnalyse():
     {
         if (maxElements != null) {
             procedureAnalyse.setMaxElements(new LongValue(maxElements.image));
+            linkAST(procedureAnalyse.getMaxElements(), maxElements, maxElements);
         }
         if (maxMemory != null) {
             procedureAnalyse.setMaxMemory(new LongValue(maxMemory.image));
+            linkAST(procedureAnalyse.getMaxMemory(), maxMemory, maxMemory);
         }
+        linkAST(procedureAnalyse, first);
         return procedureAnalyse;
     }
 }
@@ -11082,13 +11279,16 @@ RowPattern RowPatternSequence(int depth):
 {
     List<RowPattern> patterns = new ArrayList<RowPattern>();
     RowPattern pattern;
+    Token first = getToken(1);
 }
 {
     ( LOOKAHEAD({ isRowPatternPrimaryAhead() }) pattern=RowPatternFactor(depth) { patterns.add(pattern); } )*
     {
         if (patterns.isEmpty()) { return new RowPattern.Empty(); }
-        return patterns.size() == 1 ? patterns.get(0)
-            : new RowPattern.Operation(RowPattern.Operation.Type.SEQUENCE, patterns);
+        if (patterns.size() == 1) { return patterns.get(0); }
+        RowPattern result = new RowPattern.Operation(RowPattern.Operation.Type.SEQUENCE, patterns);
+        linkAST(result, first);
+        return result;
     }
 }
 
@@ -11097,6 +11297,7 @@ RowPattern RowPatternFactor(int depth) #RowPatternFactor:
     RowPattern pattern;
     String name;
     List<RowPattern> permutations = new ArrayList<RowPattern>();
+    Token first = getToken(1);
 }
 {
     (
@@ -11121,6 +11322,7 @@ RowPattern RowPatternFactor(int depth) #RowPatternFactor:
     [ LOOKAHEAD({ !(pattern instanceof RowPattern.Anchor)
             && ("?".equals(getToken(1).image) || "*".equals(getToken(1).image)
                 || "+".equals(getToken(1).image) || getToken(1).kind == OPENING_CURLY_BRACKET) })
+        { linkAST(pattern, first); }
         pattern=RowPatternQuantifier(pattern)
     ]
     { linkAST(pattern, jjtThis); return pattern; }
@@ -11155,13 +11357,14 @@ Expression RowPatternBound():
 {
     Token value;
     Expression result;
+    Token first = getToken(1);
 }
 {
     ( value=<S_LONG> { result = new LongValue(value.image); }
       | "?" { result = new JdbcParameter(++jdbcParameterIndex, false, "?"); }
       | result=UserVariable()
     )
-    { return result; }
+    { linkASTIfMissing(result, first); return result; }
 }
 
 List<Join> JoinsList():
@@ -11417,6 +11620,7 @@ OracleHierarchicalExpression OracleHierarchicalQueryClause():
 {
     OracleHierarchicalExpression result = new OracleHierarchicalExpression();
     Expression expr;
+    Token first = getToken(1);
 }
 {
     (
@@ -11438,6 +11642,7 @@ OracleHierarchicalExpression OracleHierarchicalQueryClause():
         )
     )
     {
+        linkAST(result, first);
         return result;
     }
 }
@@ -11494,12 +11699,14 @@ Expression Plus():
 Expression PriorTo():
 {
     Expression left, right, result;
+    Token first = getToken(1);
+    Token open;
 }
 {
     (
         LOOKAHEAD(3) left=PreferenceTermTerminal()
         |
-        "(" left=PreferenceTerm() ")" { left = new ParenthesedExpressionList(left); }
+        open="(" left=PreferenceTerm() ")" { left = new ParenthesedExpressionList(left); linkAST(left, open); }
     )
     { result = left; }
 
@@ -11508,10 +11715,11 @@ Expression PriorTo():
         (
             LOOKAHEAD(3) right=PreferenceTermTerminal()
             |
-            "(" right=PreferenceTerm() ")" { left = new ParenthesedExpressionList(right); }
+            open="(" right=PreferenceTerm() ")" { left = new ParenthesedExpressionList(right); linkAST(left, open); }
         )
         {
             result = new PriorTo(left, right);
+            linkAST(result, first);
             left = result;
         }
     )*
@@ -11662,7 +11870,7 @@ ExpressionList<Expression> GroupingSet():
     (
         LOOKAHEAD(2) list = ParenthesedExpressionList()
         |
-        expression = SimpleExpression() { list = new ExpressionList<Expression>(expression); }
+        expression = SimpleExpression() { list = linkElements(new ExpressionList<Expression>(expression)); }
     )
     {
         return list;
@@ -11710,6 +11918,7 @@ OrderByElement OrderByElement():
     Expression columnReference = null;
     Token collateToken = null;
     WithFill withFill = null;
+    Token first = getToken(1);
 }
 {
     columnReference = Expression()
@@ -11727,6 +11936,7 @@ OrderByElement OrderByElement():
     [ LOOKAHEAD(2) <K_WITH> <K_ROLLUP> { orderByElement.setMysqlWithRollup(true); } ]
     {
         orderByElement.setExpression(columnReference);
+        linkAST(orderByElement, first);
         return orderByElement;
     }
 }
@@ -12088,6 +12298,7 @@ OracleHint getOracleHint() {
     if (OracleHint.isHintMatch(tok.image)) {
       hint = new OracleHint();
       hint.setComment(tok.image);
+      linkAST(hint, tok, tok);
     }
   }
   return hint;
@@ -12121,10 +12332,12 @@ First First():
 Expression Expression() #Expression :
 {
     Expression expression = null;
+    Token first;
 }
 {
+    { first = getToken(1); }
     expression=Condition()
-    { expression = prattExpressionRest(expression, 2); }
+    { expression = prattExpressionRest(expression, first, 2); }
     {
         linkAST(expression,jjtThis);
         return expression;
@@ -12135,15 +12348,16 @@ Expression XorExpression():
 {
     Expression result;
     Expression right;
+    Token first = getToken(1);
 }
 {
     result=AndChain()
     (
         LOOKAHEAD(2)
         (
-            <K_OR>  right=AndChain() { result = new OrExpression(result, right); }
+            <K_OR>  right=AndChain() { result = new OrExpression(result, right); linkAST(result, first); }
             |
-            <K_XOR> right=AndChain() { result = new XorExpression(result, right); }
+            <K_XOR> right=AndChain() { result = new XorExpression(result, right); linkAST(result, first); }
         )
     )*
     { return result; }
@@ -12154,6 +12368,7 @@ Expression AndChain():
 {
     Expression result;
     Expression right;
+    Token first = getToken(1);
 }
 {
     result=Condition()
@@ -12162,11 +12377,13 @@ Expression AndChain():
         (
             <K_AND> right=Condition() {{
                 AndExpression a = new AndExpression(result, right); result = a;
+                linkAST(result, first);
             }}
             |
             <OP_DOUBLEAND> right=Condition() {{
                 AndExpression a = new AndExpression(result, right);
                 a.setUseOperator(true); result = a;
+                linkAST(result, first);
             }}
         )
     )*
@@ -12178,19 +12395,20 @@ Expression Condition():
     Expression result;
     Expression left;
     // Leading NOT / ! prefixes, leftmost token wraps outermost (issue #1170).
-    Deque<Boolean> exclamationMarks = null;
+    Deque<Token> notTokens = null;
     int oraclePrior = EqualsTo.NO_ORACLE_PRIOR;
     int oracleJoin = EqualsTo.NO_ORACLE_JOIN;
+    Token prior = null;
 }
 {
     (
         LOOKAHEAD({ getToken(1).kind == K_NOT || "!".equals(getToken(1).image) })
         ( <K_NOT> | "!" )
         {
-            if (exclamationMarks == null) {
-                exclamationMarks = new ArrayDeque<Boolean>();
+            if (notTokens == null) {
+                notTokens = new ArrayDeque<Token>();
             }
-            exclamationMarks.addFirst("!".equals(getToken(0).image));
+            notTokens.addFirst(getToken(0));
         }
     )*
     (
@@ -12207,7 +12425,7 @@ Expression Condition():
           // lookahead simulation (this path runs for every plain condition)
           LOOKAHEAD({ !interrupted })
           // A choice rather than [...], so that enclosing syntactic lookaheads honour the guard
-          ( LOOKAHEAD({ isPriorOperatorAhead() }) <K_PRIOR> { oraclePrior = EqualsTo.ORACLE_PRIOR_START; } | {} )
+          ( LOOKAHEAD({ isPriorOperatorAhead() }) <K_PRIOR> { oraclePrior = EqualsTo.ORACLE_PRIOR_START; prior = getToken(0); } | {} )
           left=SimpleExpression() { result = left; }
 
           // Consume Oracle (+) once, before dispatching
@@ -12217,7 +12435,7 @@ Expression Condition():
               {
                   oracleJoin = EqualsTo.ORACLE_JOIN_RIGHT;
                   if (left instanceof Column) {
-                      ((Column) left).setOldOracleJoinSyntax(oracleJoin);
+                      ((Column) left).setOldOracleJoinSyntax(oracleJoin); widen(left, null, getToken(0));
                   }
               }
           ]
@@ -12260,9 +12478,12 @@ Expression Condition():
         if (oraclePrior == EqualsTo.ORACLE_PRIOR_START
                 && result instanceof SupportsOldOracleJoinSyntax) {
             ((SupportsOldOracleJoinSyntax) result).setOraclePriorPosition(oraclePrior);
+            widen(result, prior, null);
         }
-        while (exclamationMarks != null && !exclamationMarks.isEmpty()) {
-            result = new NotExpression(result, exclamationMarks.pollFirst());
+        while (notTokens != null && !notTokens.isEmpty()) {
+            Token notToken = notTokens.pollFirst();
+            result = new NotExpression(result, "!".equals(notToken.image));
+            linkAST(result, notToken);
         }
         return result;
     }
@@ -12337,6 +12558,7 @@ Expression RegularConditionRHS(Expression leftExpression, int oracleJoinRight) #
 Expression OverlapsCondition(Expression leftExpression):
 {
     ExpressionList right;
+    Token operator = getToken(1);
 }
 {
     <K_OVERLAPS>
@@ -12346,9 +12568,11 @@ Expression OverlapsCondition(Expression leftExpression):
         if (leftExpression instanceof ExpressionList) {
             left = (ExpressionList) leftExpression;
         } else {
-            left = new ExpressionList(leftExpression);
+            left = linkElements(new ExpressionList(leftExpression));
         }
-        return new OverlapsCondition(left, right);
+        OverlapsCondition result = new OverlapsCondition(left, right);
+        linkAST(result, firstToken(leftExpression, operator));
+        return result;
     }
 }
 
@@ -12466,6 +12690,7 @@ Expression ExcludesExpression(Expression leftExpression) #ExcludesExpression :
 Expression Between(Expression leftExpression) :
 {
     Between result = new Between();
+    Token operator = getToken(1);
     Expression betweenExpressionStart = null;
     Expression betweenExpressionEnd = null;
 }
@@ -12492,7 +12717,7 @@ Expression Between(Expression leftExpression) :
                 "(" "+" ")"
                 {
                     if (betweenExpressionStart instanceof Column) {
-                        ((Column) betweenExpressionStart).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT);
+                        ((Column) betweenExpressionStart).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(betweenExpressionStart, null, getToken(0));
                     }
                 }
             ]
@@ -12512,7 +12737,7 @@ Expression Between(Expression leftExpression) :
                 "(" "+" ")"
                 {
                     if (betweenExpressionEnd instanceof Column) {
-                        ((Column) betweenExpressionEnd).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT);
+                        ((Column) betweenExpressionEnd).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(betweenExpressionEnd, null, getToken(0));
                     }
                 }
             ]
@@ -12522,6 +12747,7 @@ Expression Between(Expression leftExpression) :
         result.setLeftExpression(leftExpression);
         result.setBetweenExpressionStart(betweenExpressionStart);
         result.setBetweenExpressionEnd(betweenExpressionEnd);
+        linkAST(result, firstToken(leftExpression, operator));
         return result;
     }
 }
@@ -12562,7 +12788,7 @@ Expression LikeExpression(Expression leftExpression) #LikeExpression:
         "(" "+" ")"
         {
             if (rightExpression instanceof Column) {
-                ((Column) rightExpression).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT);
+                ((Column) rightExpression).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(rightExpression, null, getToken(0));
             }
         }
     ]
@@ -12595,7 +12821,7 @@ Expression SimilarToExpression(Expression leftExpression) #SimilarToExpression:
         "(" "+" ")"
         {
             if (rightExpression instanceof Column) {
-                ((Column) rightExpression).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT);
+                ((Column) rightExpression).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(rightExpression, null, getToken(0));
             }
         }
     ]
@@ -12627,6 +12853,7 @@ Expression IsDistinctExpression(Expression leftExpression) #IsDistinctExpression
 Expression IsNullExpression(Expression leftExpression):
 {
     IsNullExpression result = new IsNullExpression();
+    Token operator = getToken(1);
 }
 {
     (
@@ -12636,6 +12863,7 @@ Expression IsNullExpression(Expression leftExpression):
     )
     {
         result.setLeftExpression(leftExpression);
+        linkAST(result, firstToken(leftExpression, operator));
         return result;
     }
 }
@@ -12643,6 +12871,7 @@ Expression IsNullExpression(Expression leftExpression):
 Expression IsBooleanExpression(Expression leftExpression):
 {
     IsBooleanExpression result = new IsBooleanExpression();
+    Token operator = getToken(1);
 }
 {
         (
@@ -12651,6 +12880,7 @@ Expression IsBooleanExpression(Expression leftExpression):
 
     {
         result.setLeftExpression(leftExpression);
+        linkAST(result, firstToken(leftExpression, operator));
         return result;
     }
 }
@@ -12676,6 +12906,7 @@ Expression IsJsonExpression(Expression leftExpression):
 Expression IsUnknownExpression(Expression leftExpression):
 {
     IsUnknownExpression result = new IsUnknownExpression();
+    Token operator = getToken(1);
 }
 {
         (
@@ -12684,6 +12915,7 @@ Expression IsUnknownExpression(Expression leftExpression):
 
     {
         result.setLeftExpression(leftExpression);
+        linkAST(result, firstToken(leftExpression, operator));
         return result;
     }
 }
@@ -12692,11 +12924,13 @@ Expression ExistsExpression():
 {
     ExistsExpression result = new ExistsExpression();
     Expression rightExpression = null;
+    Token first = getToken(1);
 }
 {
     <K_EXISTS> rightExpression=SimpleExpression()
     {
         result.setRightExpression(rightExpression);
+        linkAST(result, first);
         return result;
     }
 }
@@ -12705,17 +12939,21 @@ Expression MemberOfExpression(Expression leftExpression):
 {
     MemberOfExpression result;
     Expression rightExpression = null;
+    Token operator = getToken(1);
 }
 {
     <K_MEMBER> <K_OF> rightExpression=Expression()
     {
-        return new MemberOfExpression(leftExpression, rightExpression );
+        result = new MemberOfExpression(leftExpression, rightExpression);
+        linkAST(result, firstToken(leftExpression, operator));
+        return result;
     }
 }
 
 ExpressionList ExpressionList() #ExpressionList:
 {
     ExpressionList expressionList;
+    Token first = getToken(1);
 }
 {
     // ComplexExpressionList() parses every list form, "()" and bracketed operands such as
@@ -12729,19 +12967,16 @@ ExpressionList ExpressionList() #ExpressionList:
         if ( expressionList.size() == 1 && expressionList.get(0) instanceof ExpressionList ) {
             ExpressionList subList = (ExpressionList) expressionList.get(0);
             if (expressionList instanceof ParenthesedExpressionList) {
-                if (subList instanceof ParenthesedExpressionList) {
-                    return expressionList;
-                } else {
-                    return new ParenthesedExpressionList(subList);
+                if (!(subList instanceof ParenthesedExpressionList)) {
+                    expressionList = new ParenthesedExpressionList(subList);
                 }
+            } else if (subList instanceof ParenthesedExpressionList) {
+                expressionList = new ParenthesedExpressionList(subList);
             } else {
-                if (subList instanceof ParenthesedExpressionList) {
-                    return new ParenthesedExpressionList(subList);
-                } else {
-                    return subList;
-                }
+                expressionList = subList;
             }
         }
+        linkASTIfMissing(expressionList, first);
         return expressionList;
     }
 }
@@ -12749,13 +12984,16 @@ ExpressionList ExpressionList() #ExpressionList:
 ParenthesedExpressionList ParenthesedExpressionList():
 {
     ExpressionList expressions=new ExpressionList();
+    Token first = getToken(1);
 }
 {
     "("
     [ LOOKAHEAD({ getToken(1).kind != CLOSING_BRACKET }) expressions = ComplexExpressionList() ]
     ")"
     {
-        return new ParenthesedExpressionList(expressions);
+        ParenthesedExpressionList result = new ParenthesedExpressionList(expressions);
+        linkAST(result, first);
+        return result;
     }
 }
 
@@ -12764,6 +13002,7 @@ ExpressionList SimpleExpressionList():
     ExpressionList<Column> columns;
     ExpressionList expressions = new ExpressionList();
     Expression expr;
+    Token first = getToken(1);
 }
 {
     expr=SimpleExpression() { expressions.add(expr); }
@@ -12779,6 +13018,7 @@ ExpressionList SimpleExpressionList():
         }
     )*
     {
+        linkAST(expressions, first);
         return expressions;
     }
 }
@@ -12788,11 +13028,13 @@ ExpressionList<Column> ColumnList():
 {
     ExpressionList<Column> expressions = new ExpressionList<Column>();
     Column expr;
+    Token first = getToken(1);
 }
 {
     expr=Column() { expressions.add(expr); }
     ( LOOKAHEAD(2) "," expr=Column() { expressions.add(expr); } )*
     {
+        linkAST(expressions, first);
         return expressions;
     }
 }
@@ -12800,11 +13042,14 @@ ExpressionList<Column> ColumnList():
 ParenthesedExpressionList<Column> ParenthesedColumnList():
 {
     ExpressionList<Column> expressions;
+    Token first = getToken(1);
 }
 {
     "(" expressions = ColumnList() ")"
     {
-        return new ParenthesedExpressionList<Column>(expressions);
+        ParenthesedExpressionList<Column> result = new ParenthesedExpressionList<Column>(expressions);
+        linkAST(result, first);
+        return result;
     }
 }
 
@@ -12813,6 +13058,7 @@ ExpressionList ComplexExpressionList():
     ExpressionList<Column> columns;
     ExpressionList expressions = new ExpressionList();
     Expression expr;
+    Token first = getToken(1);
 }
 {
     (
@@ -12841,6 +13087,7 @@ ExpressionList ComplexExpressionList():
     )*
 
     {
+        linkAST(expressions, first);
         return expressions;
     }
 }
@@ -12915,6 +13162,7 @@ Expression AnyComparisonExpression() :
 {
     AnyType anyType;
     Select select;
+    Token first = getToken(1);
 }
 {
     (
@@ -12926,7 +13174,9 @@ Expression AnyComparisonExpression() :
     )
     select = ParenthesedSelect()
     {
-      return new AnyComparisonExpression(anyType, select);
+      AnyComparisonExpression result = new AnyComparisonExpression(anyType, select);
+      linkAST(result, first);
+      return result;
     }
 }
 
@@ -12935,16 +13185,18 @@ Expression SimpleExpression():
     Expression retval = null;
     UserVariable user = null;
     Token operation = null;
+    Token first;
 }
 {
     [ LOOKAHEAD( 5, { getToken(1).kind == S_AT_IDENTIFIER } ) user = UserVariable() ( operation = "=" | operation = ":=" ) ]
+    { first = getToken(1); }
     retval=PrimaryExpression()
     // PostgreSQL path operators bind below arithmetic and above comparisons.
     // MySQL also gives | and & their own tiers below <<, >>, so the loop's
     // entry floor drops to 2 there instead of the shared bitwise level 4.
     {
         int arithFloor = Dialect.MYSQL.name().equals(getAsString(Feature.dialect)) ? 2 : 4;
-        retval = prattArithRest(retval, arithFloor);
+        retval = prattArithRest(retval, first, arithFloor);
     }
     {
         if (user != null) {
@@ -12952,6 +13204,7 @@ Expression SimpleExpression():
             assignment.setVariable(user);
             assignment.setOperation(operation.image);
             assignment.setExpression(retval);
+            linkAST(assignment, firstToken(user, first));
             return assignment;
         } else
             return retval;
@@ -12966,7 +13219,9 @@ StringValue CharacterSetIntroducedString():
 {
     introducer=<S_IDENTIFIER> literal=<S_CHAR_LITERAL>
     {
-        return stringValue(literal).withPrefix(introducer.image);
+        StringValue result = stringValue(literal).withPrefix(introducer.image);
+        linkAST(result, introducer, literal);
+        return result;
     }
 }
 
@@ -13049,10 +13304,12 @@ ArrayExpression ArraySubscript(Expression obj): {
     }
     "]"
     {
-        return slice == null
+        ArrayExpression result = slice == null
                 ? new ArrayExpression(obj, idxExpr, null, null)
                 : new ArrayExpression(obj, null, slice.getStartExpression(),
                         slice.getEndExpression()).withStepExpression(slice.getStepExpression());
+        linkAST(result, firstToken(obj, opening));
+        return result;
     }
 }
 
@@ -13063,6 +13320,7 @@ ArrayExpression ArraySubscript(Expression obj): {
 RangeExpression SliceTail(Expression start): {
     Expression stop = null;
     Expression step = null;
+    Token colon = getToken(1);
 } {
     ":"
     [
@@ -13073,7 +13331,11 @@ RangeExpression SliceTail(Expression start): {
     [
         ":" [ LOOKAHEAD({ !isSliceDelimiter(getToken(1)) }) step = Expression() ]
     ]
-    { return new RangeExpression(start, stop).withStepExpression(step); }
+    {
+        RangeExpression result = new RangeExpression(start, stop).withStepExpression(step);
+        linkAST(result, firstToken(start, colon));
+        return result;
+    }
 }
 
 /** A subscript of a column, such as {@code col[1]}, {@code col[1, 2]} or {@code col[1:3]}. */
@@ -13093,7 +13355,11 @@ ArrayConstructor Subscript() : {
         subscriptOpenings.pop();
     }
     "]"
-    { return new ArrayConstructor(expList, false); }
+    {
+        ArrayConstructor result = new ArrayConstructor(linkElements(expList), false);
+        linkAST(result, opening);
+        return result;
+    }
 }
 
 Expression SubscriptElement():
@@ -13123,9 +13389,11 @@ Expression ArrayIndexExpression() :
     (
         LOOKAHEAD(2) token = <K_OFFSET> "(" expr = SimpleExpression() ")"
         {
-            return new Function()
+            Function offset = new Function()
                     .withName(token.image)
-                    .withParameters(new ExpressionList<Expression>(expr));
+                    .withParameters(linkElements(new ExpressionList<Expression>(expr)));
+            linkAST(offset, token);
+            return offset;
         }
         |
         expr = SimpleExpression() { return expr; }
@@ -13153,18 +13421,25 @@ Expression NavigationStep(Expression base):
     { return step; }
 }
 
-StringValue CharacterLiteral():
+StringValue CharacterLiteral(boolean link):
 {
     Token literal;
     StringValue value;
+    Token first = getToken(1);
 }
 {
-    literal=<S_CHAR_LITERAL> { value = stringValue(literal); }
+    literal=<S_CHAR_LITERAL> { value = unlinkedStringValue(literal); }
     ( LOOKAHEAD({ isAdjacentStringConcat() })
         literal=<S_CHAR_LITERAL>
-        { value.setValue(value.getValue() + stringValue(literal).getValue()); }
+        { value.setValue(value.getValue() + unlinkedStringValue(literal).getValue()); }
     )*
-    { return value; }
+    {
+        // a primary expression links the literal itself, with its own tree node
+        if (link) {
+            linkAST(value, first);
+        }
+        return value;
+    }
 }
 
 Expression PrimaryExpression() #PrimaryExpression:
@@ -13183,6 +13458,7 @@ Expression PrimaryExpression() #PrimaryExpression:
     boolean not = false;
     boolean exclamationMarkNot = false;
     boolean dateExpressionAllowed = true;
+    Token coreFirst = null;
     ExpressionList list;
 
     List<Map.Entry<Expression, String>> jsonIdents = null;
@@ -13202,6 +13478,7 @@ Expression PrimaryExpression() #PrimaryExpression:
             }
         )*
     ]
+    { coreFirst = getToken(1); }
     (
         <K_NULL> { retval = new NullValue(); }
 
@@ -13293,13 +13570,13 @@ Expression PrimaryExpression() #PrimaryExpression:
         | LOOKAHEAD(2, {!interrupted}) retval=Column()
             [
                 LOOKAHEAD( "(" "+" ")" ("," | ")") )
-                "(" "+" ")" { ((Column) retval).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); }
+                "(" "+" ")" { ((Column) retval).setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); widen(retval, null, getToken(0)); }
             ]
 
         | LOOKAHEAD({ !interrupted && (getToken(1).kind == K_TRUE || getToken(1).kind == K_FALSE) })
           (token=<K_TRUE> | token=<K_FALSE>) { retval = new BooleanValue(token.image); }
 
-        | retval=CharacterLiteral() { linkAST(retval,jjtThis); }
+        | retval=CharacterLiteral(false)
 
         | "{d" token=<S_CHAR_LITERAL> "}"  { retval = new DateValue(token.image); }
 
@@ -13347,27 +13624,28 @@ Expression PrimaryExpression() #PrimaryExpression:
                 { retval = new FunctionAllColumns(unwrapParenthesedFunction(retval)); } ]
 
             // Share field and method navigation with the other primary expressions.
-            ( LOOKAHEAD(1, ".") nxt=NavigationStep(retval) { retval = nxt; } )*
+            ( LOOKAHEAD(1, ".") { linkASTIfMissing(retval, coreFirst); } nxt=NavigationStep(retval) { retval = nxt; } )*
         )
     )
 
     [
-        LOOKAHEAD(2, { !isColumnCollateAhead() }) <K_COLLATE> (token=<S_CHAR_LITERAL> | token=<S_QUOTED_IDENTIFIER> | token=<S_IDENTIFIER>) { retval = new CollateExpression(retval, token.image); }
+        LOOKAHEAD(2, { !isColumnCollateAhead() }) { linkASTIfMissing(retval, coreFirst); }
+        <K_COLLATE> (token=<S_CHAR_LITERAL> | token=<S_QUOTED_IDENTIFIER> | token=<S_IDENTIFIER>) { retval = new CollateExpression(retval, token.image); }
     ]
 
     [
-        LOOKAHEAD(2, { dateExpressionAllowed } ) retval = IntervalExpressionWithoutInterval(retval)
+        LOOKAHEAD(2, { dateExpressionAllowed } ) { linkASTIfMissing(retval, coreFirst); } retval = IntervalExpressionWithoutInterval(retval)
     ]
 
-    [ LOOKAHEAD(2) retval = ArrayExpression(retval) ]
+    [ LOOKAHEAD(2) { linkASTIfMissing(retval, coreFirst); } retval = ArrayExpression(retval) ]
 
     // navigation chains, e.g. Redshift SUPER col[0].field[1].sub: field accesses
     // and subscripts may alternate freely after the primary expression
     (
-        LOOKAHEAD(2) nxt = NavigationStep(retval) { retval = nxt; }
+        LOOKAHEAD(2) { linkASTIfMissing(retval, coreFirst); } nxt = NavigationStep(retval) { retval = nxt; }
     )*
 
-    (  LOOKAHEAD(2) "::" type=ColDataType() {
+    (  LOOKAHEAD(2) { linkASTIfMissing(retval, coreFirst); } "::" type=ColDataType() {
             castExpr = new CastExpression();
             castExpr.setUseCastKeyword(false);
             castExpr.setLeftExpression(retval);
@@ -13380,7 +13658,7 @@ Expression PrimaryExpression() #PrimaryExpression:
     [
         LOOKAHEAD(2, { !isPostgreSqlJsonAccess(getToken(1))
                 && ((ternaryThenBranchDepth == 0 && mapKeyDepth == 0 && !isSliceColonAhead())
-                    || !":".equals(getToken(1).image)) }) (
+                    || !":".equals(getToken(1).image)) }) { linkASTIfMissing(retval, coreFirst); } (
             LOOKAHEAD(2) (
                 token="->"
                 |
@@ -13408,7 +13686,7 @@ Expression PrimaryExpression() #PrimaryExpression:
         retval = JsonExpression(retval, jsonIdents)
     ]
 
-    ( LOOKAHEAD(2) <K_AT> <K_DATETIMELITERAL> <K_ZONE> timezoneRightExpr=PrimaryExpression() {
+    ( LOOKAHEAD(2) { linkASTIfMissing(retval, coreFirst); } <K_AT> <K_DATETIMELITERAL> <K_ZONE> timezoneRightExpr=PrimaryExpression() {
         if (timezoneExpr == null)
             timezoneExpr = new TimezoneExpression();
 
@@ -13420,16 +13698,25 @@ Expression PrimaryExpression() #PrimaryExpression:
         if (timezoneExpr != null && !timezoneExpr.getTimezoneExpressions().isEmpty()) {
             timezoneExpr.setLeftExpression(retval);
             retval=timezoneExpr;
+            // the field behind this getter is an ExpressionList
+            linkElements((ExpressionList<?>) timezoneExpr.getTimezoneExpressions());
         }
+        // each value gets a range node only once something wraps it, the outermost takes jjtThis
+        Token valueFirst = coreFirst;
         if (innerSigns != null) {
             for (int i = innerSigns.size() - 1; i >= 0; i--) {
+                linkASTIfMissing(retval, valueFirst);
                 retval = new SignedExpression(innerSigns.get(i).image.charAt(0), retval);
+                valueFirst = innerSigns.get(i);
             }
         }
         if (sign != null) {
+            linkASTIfMissing(retval, valueFirst);
             retval = new SignedExpression(sign.image.charAt(0), retval);
+            valueFirst = sign;
         }
         if (not) {
+            linkASTIfMissing(retval, valueFirst);
             retval = new NotExpression(retval, exclamationMarkNot);
         }
         linkAST(retval, jjtThis);
@@ -13535,7 +13822,9 @@ UserVariable UserVariable() : {
 {
     tk = <S_AT_IDENTIFIER> varName=IdentifierChain2(tk.image)
     {
-        return new UserVariable(varName);
+        UserVariable result = new UserVariable(varName);
+        linkAST(result, tk);
+        return result;
     }
 }
 
@@ -13571,11 +13860,14 @@ DateTimeLiteralExpression DateTimeLiteralExpression() : {
 RangeExpression RangeExpression(Expression startExpression):
 {
     Expression endExpression;
+    Token colon = getToken(1);
 }
 {
     ":" endExpression = Expression()
     {
-        return new RangeExpression(startExpression, endExpression);
+        RangeExpression result = new RangeExpression(startExpression, endExpression);
+        linkAST(result, firstToken(startExpression, colon));
+        return result;
     }
 }
 
@@ -13600,6 +13892,7 @@ ListComprehension ListComprehension() : {
 ArrayConstructor ArrayConstructor(boolean arrayKeyword) : {
     ExpressionList<Expression> expList = new ExpressionList<Expression>();
     Expression exp;
+    Token first = getToken(1);
 } {
     "["
     [
@@ -13607,7 +13900,14 @@ ArrayConstructor ArrayConstructor(boolean arrayKeyword) : {
         ( "," exp=ArrayElement() { expList.add(exp); } )*
     ]
     "]"
-    { return new ArrayConstructor(expList, arrayKeyword); }
+    {
+        ArrayConstructor result = new ArrayConstructor(linkElements(expList), arrayKeyword);
+        // after ARRAY, the caller links the constructor from that keyword
+        if (!arrayKeyword) {
+            linkAST(result, first);
+        }
+        return result;
+    }
 }
 
 Expression ArrayElement():
@@ -14462,6 +14762,8 @@ JsonAggregateFunction JsonAggregateFunction() : {
     ExpressionList expressionList = null;
     List<OrderByElement> olist = null;
     WindowElement windowElement = null;
+    Token partitionFirst = null;
+    Token partitionLast = null;
 }
 {
     (
@@ -14547,13 +14849,17 @@ JsonAggregateFunction JsonAggregateFunction() : {
         [   LOOKAHEAD(2)
             <K_OVER> {result.setAnalyticType(AnalyticType.OVER);}
             "("
-            [<K_PARTITION> <K_BY>
+            [partitionFirst=<K_PARTITION> <K_BY>
                 expressionList=ComplexExpressionList()
+                { partitionLast = getToken(0); }
             ]
             [olist=OrderByElements() ]
             [windowElement = WindowElement() ]
             {
                 result.setPartitionExpressionList(expressionList, false);
+                if (partitionFirst != null) {
+                    linkAST(result.getPartitionExpressionList(), partitionFirst, partitionLast);
+                }
                 result.setOrderByElements(olist);
                 result.setWindowElement(windowElement);
             }
@@ -14680,6 +14986,7 @@ KeepExpression KeepExpression() : {
     KeepExpression keep = new KeepExpression();
     Token token;
     List<OrderByElement> list;
+    Token first = getToken(1);
 }
 {
     <K_KEEP> "(" token = <S_IDENTIFIER> (<K_FIRST> { keep.setFirst(true); } | <K_LAST> { keep.setFirst(false); })
@@ -14688,6 +14995,7 @@ KeepExpression KeepExpression() : {
     {
         keep.setName(token.image);
         keep.setOrderByElements(list);
+        linkAST(keep, first);
         return keep;
     }
 }
@@ -14695,6 +15003,8 @@ KeepExpression KeepExpression() : {
 
 void windowFun(AnalyticExpression retval):{
      ExpressionList expressionList = null;
+     Token partitionFirst = null;
+     Token partitionLast = null;
      String windowName = null;
      WindowDefinition winDef;
 } {
@@ -14717,10 +15027,17 @@ void windowFun(AnalyticExpression retval):{
 
         [
             LOOKAHEAD(2) <K_OVER> "("
-            [   <K_PARTITION> <K_BY>
+            [   partitionFirst=<K_PARTITION> <K_BY>
                     expressionList=ComplexExpressionList()
+                    { partitionLast = getToken(0); }
             ]
-            ")" { winDef.setPartitionExpressionList(expressionList, false); retval.setType(AnalyticType.WITHIN_GROUP_OVER); }
+            ")" {
+                winDef.setPartitionExpressionList(expressionList, false);
+                if (partitionFirst != null) {
+                    linkAST(winDef.getPartitionBy(), partitionFirst, partitionLast);
+                }
+                retval.setType(AnalyticType.WITHIN_GROUP_OVER);
+            }
         ]
     )
 }
@@ -14729,6 +15046,8 @@ WindowDefinition windowDefinition() : {
     ExpressionList expressionList = null;
     List<OrderByElement> olist = null;
     WindowElement windowElement = null;
+    Token partitionFirst = null;
+    Token partitionLast = null;
     WindowDefinition winDef = new WindowDefinition();
     String baseWindowName;
 } {
@@ -14741,13 +15060,17 @@ WindowDefinition windowDefinition() : {
         |
         {}
     )
-    [<K_PARTITION> <K_BY>
+    [partitionFirst=<K_PARTITION> <K_BY>
         expressionList=ComplexExpressionList()
+        { partitionLast = getToken(0); }
     ]
     [olist=OrderByElements() ]
     [windowElement = WindowElement() ]
     {
         winDef.setPartitionExpressionList(expressionList, false);
+        if (partitionFirst != null) {
+            linkAST(winDef.getPartitionBy(), partitionFirst, partitionLast);
+        }
         winDef.setOrderByElements(olist);
         winDef.setWindowElement(windowElement);
     }
@@ -14912,6 +15235,7 @@ CastExpression ImplicitCast() #ImplicitCast:
 
     int precision = -1;
     int scale = -1;
+    Token first = getToken(1);
 }
 {
     colDataType = DataType()
@@ -14924,6 +15248,8 @@ CastExpression ImplicitCast() #ImplicitCast:
     )
     {
         CastExpression castExpression = new CastExpression(colDataType, tk2.image);
+        linkAST(castExpression.getLeftExpression(), tk2, tk2);
+        linkAST(castExpression, first);
         return castExpression;
     }
 }
@@ -15027,6 +15353,7 @@ WhenClause WhenThenSearchCondition():
     WhenClause whenThen = new WhenClause();
     Expression whenExp;
     Expression thenExp;
+    Token first = getToken(1);
 }
 {
     <K_WHEN> whenExp=Expression()
@@ -15039,6 +15366,7 @@ WhenClause WhenThenSearchCondition():
     {
        whenThen.setWhenExpression(whenExp);
        whenThen.setThenExpression(thenExp);
+       linkAST(whenThen, first);
        return whenThen;
     }
 }
@@ -15097,7 +15425,7 @@ ExpressionList ExecuteArguments(): {
         argument=ExecuteArgument() { arguments.add(argument); }
         ( LOOKAHEAD(2) "," argument=ExecuteArgument() { arguments.add(argument); } )*
     )
-    { return arguments; }
+    { return linkElements(arguments); }
 }
 
 Expression ExecuteArgument(): {
@@ -15152,7 +15480,7 @@ LambdaExpression LambdaExpression() #LambdaExpression:
     (
         columns = ParenthesedColumnList()
         |
-        s = RelObjectName() { columns = new ExpressionList<Column>(createColumn(s)); }
+        s = RelObjectName() { columns = linkElements(new ExpressionList<Column>(linkToLastToken(createColumn(s)))); }
     )
 
     "->"
@@ -15227,11 +15555,12 @@ Function SpecialStringFunctionWithNamedParameters() :
     NamedExpressionList namedExpressionList = null;
     ExpressionList expressionList = null;
     List<OrderByElement> orderByList;
+    Token open;
 }
 {
         funcName = <K_STRING_FUNCTION_NAME>
 
-        "("
+        open="("
         (
             LOOKAHEAD( { isNamedExprListAhead() } ) namedExpressionList = NamedExpressionListExprFirst()
             |
@@ -15240,10 +15569,13 @@ Function SpecialStringFunctionWithNamedParameters() :
         ")"
 
     {
-        return new Function()
+        if (namedExpressionList != null) {
+            linkAST(namedExpressionList, open);
+        }
+        return linked(new Function()
             .withName(funcName.image)
             .withNamedParameters(namedExpressionList)
-            .withParameters(expressionList);
+            .withParameters(expressionList), funcName);
     }
 }
 
@@ -15305,7 +15637,7 @@ Function InternalFunction(boolean escaped):
             LOOKAHEAD({ !isUnparenthesizedSelectAhead() }) expressionList = FunctionArgumentList(retval)
 
             |
-            LOOKAHEAD({ !getAsBoolean(Feature.allowUnparenthesizedSubSelects) }) expr = Select() { expressionList = new ExpressionList(expr); }
+            LOOKAHEAD({ !getAsBoolean(Feature.allowUnparenthesizedSubSelects) }) expr = Select() { expressionList = linkElements(new ExpressionList(expr)); }
         )
     ]
 
@@ -15442,7 +15774,7 @@ ExpressionList<Expression> XmlForestArguments():
 {
     expression=XmlForestArgument() { arguments.add(expression); }
     ( "," expression=XmlForestArgument() { arguments.add(expression); } )*
-    { return arguments; }
+    { return linkElements(arguments); }
 }
 
 Expression XmlForestArgument():
@@ -15508,13 +15840,14 @@ XMLSerializeExpr XMLSerializeExpr(): {
 JsonTableFunction.JsonTablePassingClause JsonTablePassingClause() : {
     Expression valueExpression;
     String parameterName;
+    Token first = getToken(1);
 }
 {
     valueExpression = Expression()
     <K_AS>
     parameterName = RelObjectName()
     {
-        return new JsonTableFunction.JsonTablePassingClause(valueExpression, parameterName);
+        return linked(new JsonTableFunction.JsonTablePassingClause(valueExpression, parameterName), first);
     }
 }
 
@@ -15548,6 +15881,7 @@ JsonTableFunction.JsonTableWrapperClause JsonTableWrapperClause(boolean beforePa
     JsonTableFunction.JsonTableWrapperClause wrapperClause =
             new JsonTableFunction.JsonTableWrapperClause(beforePathExpr);
     Token token;
+    Token first = getToken(1);
 }
 {
     (
@@ -15577,13 +15911,14 @@ JsonTableFunction.JsonTableWrapperClause JsonTableWrapperClause(boolean beforePa
     [ <K_ARRAY_LITERAL> { wrapperClause.setArray(true); } ]
     JsonKeyword("WRAPPER")
     {
-        return wrapperClause;
+        return linked(wrapperClause, first);
     }
 }
 
 JsonTableFunction.JsonTableQuotesClause JsonTableQuotesClause() : {
     JsonTableFunction.JsonTableQuotesClause quotesClause =
             new JsonTableFunction.JsonTableQuotesClause();
+    Token first = getToken(1);
 }
 {
     (
@@ -15596,7 +15931,7 @@ JsonTableFunction.JsonTableQuotesClause JsonTableQuotesClause() : {
         <K_ON> JsonKeyword("SCALAR") <K_STRING> { quotesClause.setOnScalarString(true); }
     ]
     {
-        return quotesClause;
+        return linked(quotesClause, first);
     }
 }
 
@@ -15615,6 +15950,7 @@ JsonTableFunction.JsonTableColumnDefinition JsonTableColumnDefinition() : {
     String encoding;
     String collation;
     Token collationLiteral;
+    Token first = getToken(1);
 }
 {
     (
@@ -15715,7 +16051,7 @@ JsonTableFunction.JsonTableColumnDefinition JsonTableColumnDefinition() : {
         )
     )
     {
-        return columnDefinition;
+        return linked(columnDefinition, first);
     }
 }
 
@@ -15723,6 +16059,7 @@ JsonTableFunction.JsonTableColumnsClause JsonTableColumnsClause() : {
     JsonTableFunction.JsonTableColumnsClause columnsClause =
             new JsonTableFunction.JsonTableColumnsClause();
     JsonTableFunction.JsonTableColumnDefinition columnDefinition;
+    Token first = getToken(1);
 }
 {
     <K_COLUMNS> "("
@@ -15739,7 +16076,7 @@ JsonTableFunction.JsonTableColumnsClause JsonTableColumnsClause() : {
     ]
     ")"
     {
-        return columnsClause;
+        return linked(columnsClause, first);
     }
 }
 
@@ -15748,6 +16085,7 @@ JsonTableFunction.JsonTablePlanTerm JsonTablePlanTerm() : {
     String value;
     Expression expression;
     JsonTableFunction.JsonTablePlanExpression nestedPlanExpression;
+    Token first = getToken(1);
 }
 {
     (
@@ -15769,7 +16107,7 @@ JsonTableFunction.JsonTablePlanTerm JsonTablePlanTerm() : {
         }
     )
     {
-        return term;
+        return linked(term, first);
     }
 }
 
@@ -15778,6 +16116,7 @@ JsonTableFunction.JsonTablePlanExpression JsonTablePlanExpression() : {
             new JsonTableFunction.JsonTablePlanExpression();
     JsonTableFunction.JsonTablePlanTerm term;
     Token operator = null;
+    Token first = getToken(1);
 }
 {
     term = JsonTablePlanTerm() { planExpression.addTerm(term); }
@@ -15806,7 +16145,7 @@ JsonTableFunction.JsonTablePlanExpression JsonTablePlanExpression() : {
         term = JsonTablePlanTerm() { planExpression.addTerm(term); }
     )*
     {
-        return planExpression;
+        return linked(planExpression, first);
     }
 }
 
@@ -15814,13 +16153,14 @@ JsonTableFunction.JsonTablePlanClause JsonTablePlanClause() : {
     JsonTableFunction.JsonTablePlanClause planClause =
             new JsonTableFunction.JsonTablePlanClause();
     JsonTableFunction.JsonTablePlanExpression planExpression;
+    Token first = getToken(1);
 }
 {
     <K_PLAN>
     [ <K_DEFAULT> { planClause.setDefaultPlan(true); } ]
     "(" planExpression = JsonTablePlanExpression() ")" { planClause.setPlanExpression(planExpression); }
     {
-        return planClause;
+        return linked(planClause, first);
     }
 }
 
@@ -15828,6 +16168,7 @@ JsonTableFunction.JsonTableOnErrorClause JsonTableOnErrorClause(boolean beforeCo
     JsonTableFunction.JsonTableOnErrorClause onErrorClause =
             new JsonTableFunction.JsonTableOnErrorClause(beforeColumns);
     Token token;
+    Token first = getToken(1);
 }
 {
     (
@@ -15843,7 +16184,7 @@ JsonTableFunction.JsonTableOnErrorClause JsonTableOnErrorClause(boolean beforeCo
     )
     <K_ON> <K_ERROR>
     {
-        return onErrorClause;
+        return linked(onErrorClause, first);
     }
 }
 
@@ -15851,6 +16192,7 @@ JsonTableFunction.JsonTableOnEmptyClause JsonTableOnEmptyClause() : {
     JsonTableFunction.JsonTableOnEmptyClause onEmptyClause =
             new JsonTableFunction.JsonTableOnEmptyClause();
     Token token;
+    Token first = getToken(1);
 }
 {
     (
@@ -15866,12 +16208,13 @@ JsonTableFunction.JsonTableOnEmptyClause JsonTableOnEmptyClause() : {
     )
     <K_ON> <K_EMPTY>
     {
-        return onEmptyClause;
+        return linked(onEmptyClause, first);
     }
 }
 
 JsonTableFunction.JsonTableParsingTypeClause JsonTableParsingTypeClause() : {
     JsonTableFunction.JsonTableParsingTypeClause parsingType = new JsonTableFunction.JsonTableParsingTypeClause();
+    Token first = getToken(1);
 }
 {
     <K_TYPE>
@@ -15884,7 +16227,7 @@ JsonTableFunction.JsonTableParsingTypeClause JsonTableParsingTypeClause() : {
     )
     <CLOSING_BRACKET>
     {
-        return parsingType;
+        return linked(parsingType, first);
     }
 }
 
@@ -15910,7 +16253,7 @@ JsonTableFunction JsonTableBody() : {
         ","
         jsonPath = Expression() {
             function.setJsonPathExpression(jsonPath);
-            function.setParameters(new ExpressionList(jsonInput, jsonPath));
+            function.setParameters(linkElements(new ExpressionList(jsonInput, jsonPath)));
         }
         [ <K_AS> pathName = RelObjectName() { function.setPathName(pathName); } ]
     ]
@@ -15939,12 +16282,13 @@ XmlTableFunction.XmlTablePassingClause XmlTablePassingClause() : {
     XmlTableFunction.XmlTablePassingClause passingClause = new XmlTableFunction.XmlTablePassingClause();
     Expression valueExpression;
     String name = null;
+    Token first = getToken(1);
 }
 {
     valueExpression = Expression() { passingClause.setValueExpression(valueExpression); }
     [ <K_AS> name = RelObjectName() { passingClause.setName(name); } ]
     {
-        return passingClause;
+        return linked(passingClause, first);
     }
 }
 
@@ -15953,6 +16297,7 @@ XmlTableFunction.XmlTableColumnDefinition XmlTableColumnDefinition() : {
     String columnName;
     ColDataType dataType;
     Expression expression;
+    Token first = getToken(1);
 }
 {
     columnName = RelObjectName() { columnDefinition.setColumnName(columnName); }
@@ -15964,7 +16309,7 @@ XmlTableFunction.XmlTableColumnDefinition XmlTableColumnDefinition() : {
         [ <K_DEFAULT> expression = Expression() { columnDefinition.setDefaultExpression(expression); } ]
     )
     {
-        return columnDefinition;
+        return linked(columnDefinition, first);
     }
 }
 
@@ -16006,6 +16351,7 @@ TableFunction TableFunction():
     Function function = null;
     ParenthesedExpressionList<Function> rowsFromFunctions = null;
     Token withClause = null;
+    Token keyword;
 }
 {
     [ prefix = <K_LATERAL> ]
@@ -16016,15 +16362,15 @@ TableFunction TableFunction():
             getToken(1).kind == S_IDENTIFIER
                 && getToken(1).image.equalsIgnoreCase("JSON_TABLE")
         })
-        JsonKeyword("JSON_TABLE")
-        function = JsonTableBody()
+        JsonKeyword("JSON_TABLE") { keyword = getToken(0); }
+        function = JsonTableBody() { linkAST(function, keyword); }
         |
         LOOKAHEAD({
             getToken(1).kind == S_IDENTIFIER
                 && getToken(1).image.equalsIgnoreCase("XMLTABLE")
         })
-        <S_IDENTIFIER>
-        function = XmlTableBody()
+        keyword=<S_IDENTIFIER>
+        function = XmlTableBody() { linkAST(function, keyword); }
         |
         function=Function()
     )
@@ -16054,6 +16400,7 @@ ParenthesedExpressionList<Function> RowsFromFunctionList():
 {
     ParenthesedExpressionList<Function> functions = new ParenthesedExpressionList<Function>();
     Function function;
+    Token first = getToken(1);
 }
 {
     "("
@@ -16064,6 +16411,7 @@ ParenthesedExpressionList<Function> RowsFromFunctionList():
         )*
     ")"
     {
+        linkAST(functions, first);
         return functions;
     }
 }
@@ -16734,6 +17082,7 @@ StringValue MySqlAccountNamePart():
                     ? new StringValue().withValue(name.substring(1, name.length() - 1))
                             .setQuoteStr(name.substring(0, 1))
                     : new StringValue().withValue(name).setQuoteStr("");
+            linkToLastToken(value);
         }
     )
     { return value; }
@@ -17411,7 +17760,7 @@ void MySqlDefiner(MySqlDefiner definer):
     ContextualKeyword("DEFINER") "="
     (
         LOOKAHEAD({ isKeywordAhead("CURRENT_USER") }) name=RelObjectName()
-        { definer.setUser(new StringValue(name).setQuoteStr("")); }
+        { definer.setUser(linkToLastToken(new StringValue(name).setQuoteStr(""))); }
         [ "(" ")" { definer.setCurrentUserParentheses(true); } ]
         |
         account=MySqlAccountName() { definer.setUser(account.getUser()); definer.setHost(account.getHost()); }
@@ -17490,13 +17839,14 @@ Statement MySqlTriggerBody():
 {
     Statement body;
     List<String> tokens;
+    Token first = getToken(1);
 }
 {
     (
         LOOKAHEAD({ isStatementBlockAhead() }) body=BeginEndBlock()
         |
         LOOKAHEAD({ isMySqlCompoundStatementAhead() }) tokens=captureCompoundStatement()
-        { body = new UnsupportedStatement(tokens); }
+        { body = linked(new UnsupportedStatement(tokens), first); }
         |
         body=SingleStatement()
     )
@@ -17620,6 +17970,7 @@ CreateSchema CreateSchema():
 Statement SchemaElement():
 {
     Statement element;
+    Token first = getToken(1);
 }
 {
     { schemaElementDepth++; }
@@ -17638,7 +17989,7 @@ Statement SchemaElement():
     } finally {
         schemaElementDepth--;
     }
-    { return element; }
+    { linkStatement(element, first); return element; }
 }
 
 DatabaseOption MySqlDatabaseOption():
@@ -18200,7 +18551,7 @@ TableElement TableConstraint(boolean createContext):
 NotNullConstraint PostgreSqlNotNullConstraint():
 { NotNullConstraint constraint = new NotNullConstraint(); String name; boolean noInherit; }
 {
-    <K_NOT> <K_NULL> name=RelObjectName() { constraint.setColumn(createColumn(name)); }
+    <K_NOT> <K_NULL> name=RelObjectName() { constraint.setColumn(linkToLastToken(createColumn(name))); }
     noInherit=PostgreSqlNoInheritClause() { constraint.setNoInherit(noInherit); }
     { return constraint; }
 }
@@ -18271,6 +18622,8 @@ KeyElement PostgreSqlExcludeElement():
 CreateTable CreateTable(boolean isUsingOrReplace):
 {
     CreateTable createTable = new CreateTable();
+    Token ofFirst;
+    Token executeFirst;
     Table table = null;
     List<TableElement> tableElements = new ArrayList<TableElement>();
     TableElement element;
@@ -18317,9 +18670,10 @@ CreateTable CreateTable(boolean isUsingOrReplace):
         [ LOOKAHEAD(2) tableColumn=TimeTravelAfterAlias() { likeTable.setTimeTravel(tableColumn); } ]
         { createTable.setCloneTable(likeTable); likeTable = null; }
     ]
-    [ <K_OF> typeName=RelObjectNames() {
+    [ <K_OF> { ofFirst = getToken(1); } typeName=RelObjectNames() {
         ofType = new ColDataType();
         ofType.setDataType(typeName.getNames());
+        linkAST(ofType, ofFirst);
         createTable.setOfType(ofType);
     } ]
     [ LOOKAHEAD(2) <K_PARTITION> <K_OF> partitionOfTable=Table()
@@ -18370,7 +18724,8 @@ CreateTable CreateTable(boolean isUsingOrReplace):
                     tk.image.toUpperCase(Locale.ROOT))); } ]
         [ <K_AS> { createTable.setUseAsKeyword(true); } ]
         (
-            LOOKAHEAD(1, <K_EXECUTE>) execute=Execute() {
+            LOOKAHEAD(1, <K_EXECUTE>) { executeFirst = getToken(1); } execute=Execute() {
+                linkStatement(execute, executeFirst);
                 requireDdlSyntax(createTable.isUseAsKeyword() && createTable.getDuplicateHandling() == null,
                         "CREATE TABLE EXECUTE requires AS and cannot use duplicate handling");
                 createTable.setExecute(execute);
@@ -18804,11 +19159,11 @@ AlterExpressionOrderBy MySqlAlterOrderBy():
 }
 
 OrderByElement MySqlAlterOrderColumn():
-{ OrderByElement element = new OrderByElement(); String name; Token order; }
+{ OrderByElement element = new OrderByElement(); String name; Token order; Token first = getToken(1); }
 {
-    name=RelObjectName() { element.setExpression(createColumn(name)); }
+    name=RelObjectName() { element.setExpression(linkToLastToken(createColumn(name))); }
     [ LOOKAHEAD(2) ( order=<K_ASC> | order=<K_DESC> ) { element.setAsc(order.kind == K_ASC); element.setAscDescPresent(true); } ]
-    { return element; }
+    { linkAST(element, first); return element; }
 }
 
 String MySqlTableOptionValue(): {
@@ -18863,12 +19218,13 @@ ColDataType DataType():
     String precision = null;
     Integer scale = null;
     String scaleText;
+    Token first = getToken(1);
 }
 {
     (
         LOOKAHEAD(2) tk=<K_TEXT_LITERAL> {
             type = tk.image;
-            return ColDataType.fromTypeParameters(type, precision, scale);
+            return linked(ColDataType.fromTypeParameters(type, precision, scale), first);
         }
         |
 		LOOKAHEAD(2) tk=<K_ARRAY_LITERAL> (
@@ -18913,7 +19269,7 @@ ColDataType DataType():
     )
 
     {
-        return colDataType;
+        return linked(colDataType, first);
     }
 }
 
@@ -18968,6 +19324,7 @@ ColDataType ColDataType():
     Token varying = null;
     ColDataType.TypeModifier typeModifier = null;
     XmlTypeModifier xmlTypeModifier = null;
+    Token first = getToken(1);
 }
 {
     (
@@ -19148,6 +19505,7 @@ ColDataType ColDataType():
         if (zonePrecision != null) {
             colDataType.setPrecision(zonePrecision);
         }
+        linkAST(colDataType, first);
         return colDataType;
     }
 }
@@ -19378,7 +19736,7 @@ SecurityLabel SecurityLabel():
         |
         name=RelObjectName() { statement.setObjectName(type, new Table(name, false)); }
     )
-    <K_IS> ( label=CharacterLiteral() { statement.setLabel(label); } | <K_NULL> )
+    <K_IS> ( label=CharacterLiteral(true) { statement.setLabel(label); } | <K_NULL> )
     { return statement; }
 }
 
@@ -19430,7 +19788,7 @@ ExpressionList<Column> ColumnWithCommentList():
          ( "," img=Column() { expressions.add(img); } )*
     ")"
     {
-        return expressions;
+        return linkElements(expressions);
     }
 }
 
@@ -20940,7 +21298,7 @@ DefaultConstraint DefaultConstraintSpec():
 {
     [ <K_CONSTRAINT> name=RelObjectName() { constraint.setName(name); } ]
     <K_DEFAULT> expression=Expression() { constraint.setExpression(expression); }
-    <K_FOR> name=RelObjectName() { constraint.setColumn(createColumn(name)); }
+    <K_FOR> name=RelObjectName() { constraint.setColumn(linkToLastToken(createColumn(name))); }
     // See InsertBulk(): <K_WITH> is in the FOLLOW set of every statement tail. WITH VALUES wins
     // over a hypothetical CTE named VALUES, which is the useful reading here.
     [ LOOKAHEAD(2) <K_WITH> <K_VALUES> { constraint.setWithValues(true); } ]
@@ -22659,7 +23017,7 @@ Comment Comment():
     )
     <K_IS>
     (
-        comment=CharacterLiteral() { result.setComment(comment); }
+        comment=CharacterLiteral(true) { result.setComment(comment); }
         | <K_NULL>
     )
     {
@@ -22960,7 +23318,7 @@ ConfigurationParameterChange ConfigurationParameterChange():
 
 Expression AccessSettingValue():
 { Expression value; Token token; }
-{ ( LOOKAHEAD(1) token=<K_ON> { value = new Column(token.image); } | value=PrimaryExpression() ) { return value; } }
+{ ( LOOKAHEAD(1) token=<K_ON> { value = linkToLastToken(new Column(token.image)); } | value=PrimaryExpression() ) { return value; } }
 
 /** PostgreSQL and MySQL static privileges; another identifier is a MySQL dynamic privilege. */
 Privilege AccessPrivilege():
@@ -23005,9 +23363,9 @@ Privilege AccessPrivilege():
     [ LOOKAHEAD({ isAccessKeywordAhead("PRIVILEGES") })
       AccessKeyword("PRIVILEGES") { requireAccessSyntax(result.getKind() == Privilege.Kind.ALL, "PRIVILEGES requires ALL"); result.setUsePrivileges(true); } ]
     [ "(" { columns = new ExpressionList<Column>(); }
-      column=RelObjectName() { columns.add(new Column(column)); }
-      ( "," column=RelObjectName() { columns.add(new Column(column)); } )*
-      ")" { result.setColumns(columns); } ]
+      column=RelObjectName() { columns.add(linkToLastToken(new Column(column))); }
+      ( "," column=RelObjectName() { columns.add(linkToLastToken(new Column(column))); } )*
+      ")" { result.setColumns(linkElements(columns)); } ]
     { return result; }
 }
 
@@ -23220,14 +23578,15 @@ Revoke Revoke(boolean defaults):
 }
 
 AlterDefaultPrivileges AlterDefaultPrivileges():
-{ AlterDefaultPrivileges result = new AlterDefaultPrivileges(); Token token; List<String> names; Grant grant; Revoke revoke; }
+{ AlterDefaultPrivileges result = new AlterDefaultPrivileges(); Token token; List<String> names; Grant grant; Revoke revoke; Token statementFirst; }
 {
     <K_DEFAULT> AccessKeyword("PRIVILEGES")
     [ <K_FOR> ( token=<S_IDENTIFIER> | token=<K_USER> ) { result.setRoleKeyword(accessEnum(AlterDefaultPrivileges.RoleKeyword.class, token.image)); }
       names=AccessNames() { result.setRoles(names); } ]
     [ <K_IN> <K_SCHEMA> names=AccessNames() { result.setSchemas(names); } ]
-    ( grant=AccessGrant(true) { result.setGrant(grant); }
-      | revoke=Revoke(true) { result.setRevoke(revoke); } )
+    { statementFirst = getToken(1); }
+    ( grant=AccessGrant(true) { linkStatement(grant, statementFirst); result.setGrant(grant); }
+      | revoke=Revoke(true) { linkStatement(revoke, statementFirst); result.setRevoke(revoke); } )
     { return result; }
 }
 
@@ -23240,9 +23599,9 @@ TriggerEvent PostgreSqlTriggerEvent():
         | <K_TRUNCATE> { result = new TriggerEvent(CreateTrigger.Event.TRUNCATE); }
         | <K_UPDATE> { result = new TriggerEvent(CreateTrigger.Event.UPDATE); }
           [ <K_OF> { columns = new ExpressionList<Column>(); }
-            name=RelObjectName() { columns.add(createColumn(name)); }
-            ( "," name=RelObjectName() { columns.add(createColumn(name)); } )*
-            { result.setColumns(columns); } ]
+            name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); }
+            ( "," name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); } )*
+            { result.setColumns(linkElements(columns)); } ]
     )
     { return result; }
 }
@@ -23334,7 +23693,7 @@ Expression PostgreSqlTriggerArgument():
         token=<S_CHAR_LITERAL> { result = stringValue(token); }
         | token=<S_LONG> { result = new LongValue(token.image); }
         | token=<S_DOUBLE> { result = new DoubleValue(token.image); }
-        | name=RelObjectName() { result = createColumn(name); }
+        | name=RelObjectName() { result = linkToLastToken(createColumn(name)); }
     )
     { return result; }
 }
@@ -23520,7 +23879,12 @@ void SequenceDefinitionOptions(Sequence sequence):
             parameter=SequenceParameter() { parameters.add(parameter); }
         )
     )*
-    { sequence.setParameters(parameters); }
+    {
+        sequence.setParameters(parameters);
+        if (!parameters.isEmpty() || sequence.getOwnership() != null) {
+            widen(sequence, null, getToken(0));
+        }
+    }
 }
 
 CreateSequence CreateSequence():
@@ -24050,7 +24414,7 @@ Expression ExtensionVersion():
 { Token token; String name; Expression result; }
 {
     ( token=<S_CHAR_LITERAL> { result = stringValue(token); }
-      | name=RelObjectName() { result = createColumn(name); } )
+      | name=RelObjectName() { result = linkToLastToken(createColumn(name)); } )
     { return result; }
 }
 
@@ -24451,7 +24815,7 @@ void ReplicationKeyword(String expected):
 Expression ReplicationOptionValue():
 { Token token; Expression result; }
 {
-    ( LOOKAHEAD(1) token=<K_ON> { result = new Column(token.image); } | result=PrimaryExpression() )
+    ( LOOKAHEAD(1) token=<K_ON> { result = linkToLastToken(new Column(token.image)); } | result=PrimaryExpression() )
     { return result; }
 }
 
@@ -24492,9 +24856,9 @@ PublicationTable PublicationTable(boolean drop):
     table=Table() { result.setTable(table); }
     [ "*" { result.setIncludeDescendants(true); } ]
     [ LOOKAHEAD(1) "(" { columns = new ExpressionList<Column>(); }
-      name=RelObjectName() { columns.add(createColumn(name)); }
-      ( "," name=RelObjectName() { columns.add(createColumn(name)); } )* ")"
-      { result.setColumns(columns); } ]
+      name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); }
+      ( "," name=RelObjectName() { columns.add(linkToLastToken(createColumn(name))); } )* ")"
+      { result.setColumns(linkElements(columns)); } ]
     [ <K_WHERE> "(" expression=Expression() ")" { result.setWhere(expression); } ]
     {
         requireReplicationSyntax(!(result.isOnly() && result.isIncludeDescendants()), "ONLY and * cannot be combined");
@@ -24674,11 +25038,12 @@ DropPolicy DropPolicy():
 UnsupportedStatement UnsupportedStatement():
 {
   List<String> tokens = new LinkedList<String>();
+  Token first = getToken(1);
 }
 {
   tokens=captureUnsupportedStatementDeclaration()
   {
-    return new UnsupportedStatement(tokens);
+    return linked(new UnsupportedStatement(tokens), first);
   }
 }
 
@@ -25137,10 +25502,10 @@ CreateStatistics CreateStatistics():
     }
 }
 Expression PostgreSqlStatisticsExpression():
-{ Expression expression; String name; }
+{ Expression expression; String name; Token open; }
 {
-    ( "(" expression=Expression() ")" { expression = new ParenthesedExpressionList<Expression>(expression); }
-      | name=RelObjectName() { expression = createColumn(name); } )
+    ( open="(" expression=Expression() ")" { expression = new ParenthesedExpressionList<Expression>(expression); linkAST((ASTNodeAccess) expression, open); }
+      | name=RelObjectName() { expression = linkToLastToken(createColumn(name)); } )
     { return expression; }
 }
 AlterStatistics AlterStatistics():
diff --git a/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java b/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
new file mode 100644
index 0000000000..6ce2622099
--- /dev/null
+++ b/src/test/java/net/sf/jsqlparser/parser/ASTNodeCoverageTest.java
@@ -0,0 +1,377 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2026 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.parser;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayDeque;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Deque;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.AnalyticExpression;
+import net.sf.jsqlparser.expression.CaseExpression;
+import net.sf.jsqlparser.expression.CastExpression;
+import net.sf.jsqlparser.expression.ConnectByPriorOperator;
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.Function;
+import net.sf.jsqlparser.expression.operators.relational.EqualsTo;
+import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.Statements;
+import net.sf.jsqlparser.statement.create.sequence.CreateSequence;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Every object a parse returns that implements {@link ASTNodeAccess} maps back to its source text.
+ * Its node spans at least one character, inside the range of the object that holds it. No two
+ * ranges in a statement partly overlap, and the text of an expression's range parses to that
+ * expression again. The model is walked through its getters, over the SQL files of the test
+ * resources.
+ */
+public class ASTNodeCoverageTest {
+    private static final Path CORPUS = Paths.get("src/test/resources");
+
+    @Test
+    public void testEveryParsedNodeMapsBackToItsSource() throws IOException {
+        Map<String, String> problems = new TreeMap<>();
+        for (Path file : sqlFiles()) {
+            String sql = Files.readString(file);
+            Object statements;
+            try {
+                // a statement the parser rejects leaves the rest of its file to check, and the
+                // Oracle tests parse in the dialect they are written in
+                boolean oracle = file.toString().contains("oracle-tests");
+                statements = CCJSqlParserUtil.parseStatements(sql, parser -> {
+                    parser.withErrorRecovery();
+                    if (oracle) {
+                        parser.withDialect(AbstractJSqlParser.Dialect.ORACLE);
+                    }
+                });
+            } catch (JSQLParserException e) {
+                // the corpus also holds SQL the parser rejects
+                continue;
+            }
+            new Walk(file.toString(), sql, problems).check(statements);
+        }
+        assertThat(problems).isEmpty();
+    }
+
+    @Test
+    public void testRangesOfStatementsClausesAndTypes() throws JSQLParserException {
+        String sql = "WITH t AS (SELECT 1) SELECT * FROM t;";
+        assertSpans("WITH t AS (SELECT 1) SELECT * FROM t", sql, (ASTNodeAccess) statement(sql));
+
+        sql = "UPDATE t SET a = 1 WHERE b = 2";
+        assertSpans(sql, sql, (ASTNodeAccess) statement(sql));
+
+        sql = "SELECT /*+ INDEX(t i) */ a FROM t";
+        assertSpans("/*+ INDEX(t i) */", sql, ((PlainSelect) statement(sql)).getOracleHint());
+
+        sql = "SELECT CASE WHEN a = 1 THEN 'x' END, CAST(a AS DECIMAL(10, 2)), s.t.c,"
+                + " ROW_NUMBER() OVER (PARTITION BY a ORDER BY b), SUBSTRING(a FROM 2 FOR 3)"
+                + " FROM t ORDER BY a DESC NULLS LAST";
+        PlainSelect select = (PlainSelect) statement(sql);
+        assertSpans("WHEN a = 1 THEN 'x'", sql,
+                ((CaseExpression) item(select, 0)).getWhenClauses().get(0));
+        assertSpans("DECIMAL(10, 2)", sql, ((CastExpression) item(select, 1)).getColDataType());
+        assertSpans("s.t", sql, ((Column) item(select, 2)).getTable());
+        assertSpans("PARTITION BY a", sql,
+                (ASTNodeAccess) ((AnalyticExpression) item(select, 3))
+                        .getPartitionExpressionList());
+        // the list prints the parentheses of its function
+        assertSpans("(a FROM 2 FOR 3)", sql, ((Function) item(select, 4)).getNamedParameters());
+        assertSpans("a DESC NULLS LAST", sql, select.getOrderByElements().get(0));
+
+        sql = "SELECT * FROM a, b WHERE a.id(+) = b.id";
+        assertSpans("a.id(+)", sql,
+                ((EqualsTo) ((PlainSelect) statement(sql)).getWhere()).getLeftExpression());
+
+        sql = "SELECT id FROM t LIMIT 5 BY id";
+        assertSpans("LIMIT 5 BY id", sql, ((PlainSelect) statement(sql)).getLimitBy());
+
+        sql = "CREATE SEQUENCE s INCREMENT BY 1 OWNED BY t.c";
+        assertSpans("s INCREMENT BY 1 OWNED BY t.c", sql,
+                ((CreateSequence) statement(sql)).getSequence());
+
+        sql = "SELECT 'a'\n'b'";
+        Statement merged = CCJSqlParserUtil.parse(sql, parser -> parser.withAdjacentStringLiterals(
+                AbstractJSqlParser.AdjacentStringLiterals.NEWLINE));
+        assertSpans("'a'\n'b'", sql, item((PlainSelect) merged, 0));
+    }
+
+    @Test
+    public void testStatementsTheCorpusLacks() throws JSQLParserException {
+        Map<String, String> problems = new TreeMap<>();
+        for (String sql : new String[] {
+                "WITH x AS (INSERT INTO t VALUES (1) RETURNING *) SELECT * FROM x",
+                "WITH x AS (UPDATE t SET a = 1 RETURNING *) SELECT * FROM x",
+                "WITH x AS (DELETE FROM t RETURNING *) SELECT * FROM x",
+                "CREATE SCHEMA s CREATE TABLE t (a INT) CREATE VIEW v AS SELECT 1",
+                "CREATE TABLE t AS EXECUTE p",
+                "ALTER DEFAULT PRIVILEGES GRANT SELECT ON TABLES TO r",
+                "IF a = 1 SELECT 1;",
+                "BEGIN SELECT 1; END;"}) {
+            new Walk(sql, sql, problems).check(CCJSqlParserUtil.parseStatements(sql));
+        }
+        String block = "BEGIN x := 1; NULL; foo(1); END;";
+        new Walk(block, block, problems).check(CCJSqlParserUtil.parseStatements(block,
+                parser -> parser.withDialect(AbstractJSqlParser.Dialect.ORACLE)));
+        String opaque = "FOO BAR BAZ";
+        new Walk(opaque, opaque, problems).check(CCJSqlParserUtil.parseStatements(opaque,
+                parser -> parser.withUnsupportedStatements(true)));
+        assertThat(problems).isEmpty();
+    }
+
+    @Test
+    public void testCommentBeforeEndOfInputHasPosition() throws ParseException {
+        String sql = "SELECT a FROM t -- trailing";
+        Statements statements = CCJSqlParserUtil.newParser(sql).Statements();
+        Token endOfInput = ((ASTNodeAccess) statements.get(0)).getASTNode().jjtGetLastToken().next;
+        Token comment = endOfInput.specialToken;
+        assertEquals("-- trailing",
+                sql.substring(comment.absoluteBegin - 1, comment.absoluteEnd - 1));
+    }
+
+    private static Statement statement(String sql) throws JSQLParserException {
+        return CCJSqlParserUtil.parse(sql);
+    }
+
+    private static Expression item(PlainSelect select, int index) {
+        return select.getSelectItem(index).getExpression();
+    }
+
+    private static void assertSpans(String expected, String sql, ASTNodeAccess part) {
+        Node node = part.getASTNode();
+        assertEquals(expected, sql.substring(node.jjtGetFirstToken().absoluteBegin - 1,
+                node.jjtGetLastToken().absoluteEnd - 1), part.getClass().getSimpleName());
+    }
+
+    private static List<Path> sqlFiles() throws IOException {
+        try (Stream<Path> files = Files.walk(CORPUS)) {
+            return files.filter(file -> file.toString().endsWith(".sql")).sorted()
+                    .collect(Collectors.toList());
+        }
+    }
+
+    private static final class Walk {
+        private final String source;
+        private final String sql;
+        private final Map<String, String> problems;
+        private final Set<Object> visited = Collections.newSetFromMap(new IdentityHashMap<>());
+        private final List<Object[]> ranges = new ArrayList<>();
+
+        Walk(String source, String sql, Map<String, String> problems) {
+            this.source = source;
+            this.sql = sql;
+            this.problems = problems;
+        }
+
+        void check(Object statements) {
+            visit(statements, null);
+            checkNoPartialOverlap();
+        }
+
+        private void visit(Object value, int[] enclosing) {
+            if (value == null || !visited.add(value)) {
+                return;
+            }
+            int[] range = range(value);
+            if (range != null) {
+                checkRange(value, range, enclosing);
+            }
+            int[] inner = range != null ? range : enclosing;
+            visitElements(value, inner);
+            if (isModel(value)) {
+                for (Method getter : value.getClass().getMethods()) {
+                    if (isChildGetter(getter)) {
+                        visitChild(value, getter, inner);
+                    }
+                }
+            }
+        }
+
+        private void visitElements(Object value, int[] enclosing) {
+            if (value instanceof Collection) {
+                for (Object element : (Collection<?>) value) {
+                    visit(element, enclosing);
+                }
+            } else if (value instanceof Map) {
+                for (Map.Entry<?, ?> entry : ((Map<?, ?>) value).entrySet()) {
+                    visit(entry.getKey(), enclosing);
+                    visit(entry.getValue(), enclosing);
+                }
+            } else if (value instanceof Map.Entry) {
+                visit(((Map.Entry<?, ?>) value).getKey(), enclosing);
+                visit(((Map.Entry<?, ?>) value).getValue(), enclosing);
+            } else if (value instanceof Optional) {
+                ((Optional<?>) value).ifPresent(present -> visit(present, enclosing));
+            }
+        }
+
+        private void visitChild(Object value, Method getter, int[] enclosing) {
+            try {
+                Object child = getter.invoke(value);
+                if (isHeld(child, getter.invoke(value))) {
+                    visit(child, enclosing);
+                }
+            } catch (ReflectiveOperationException | RuntimeException e) {
+                // a getter that cannot answer for this object has no child to walk
+            }
+        }
+
+        /**
+         * The object's range, or null when it has none, reporting an object that should have one.
+         */
+        private int[] range(Object value) {
+            // an object that prints as nothing, such as a clause left at its default, has no text
+            if (!(value instanceof ASTNodeAccess) || value.toString().isBlank()) {
+                return null;
+            }
+            Node node = ((ASTNodeAccess) value).getASTNode();
+            if (node == null) {
+                report("has no node", value);
+                return null;
+            }
+            if (node.parser != null) {
+                report("keeps its parser alive", value);
+            }
+            int begin = node.jjtGetFirstToken().absoluteBegin - 1;
+            int end = node.jjtGetLastToken().absoluteEnd - 1;
+            if (begin < 0 || end <= begin || end > sql.length()) {
+                report("spans no text", value);
+                return null;
+            }
+            return new int[] {begin, end};
+        }
+
+        private void checkRange(Object value, int[] range, int[] enclosing) {
+            if (enclosing != null && (range[0] < enclosing[0] || range[1] > enclosing[1])) {
+                report("lies outside the object that holds it", value);
+            }
+            checkInsideParent(value, range);
+            ranges.add(new Object[] {range, value});
+            String text = sql.substring(range[0], range[1]);
+            // PRIOR is an operator only inside CONNECT BY
+            if (value instanceof Expression && !(value instanceof ConnectByPriorOperator)) {
+                checkReparses(value, text,
+                        expression -> CCJSqlParserUtil.parseExpression(expression, false));
+            } else if (value instanceof Statement) {
+                checkReparses(value, text, CCJSqlParserUtil::parse);
+            }
+        }
+
+        private void checkInsideParent(Object value, int[] range) {
+            ASTNodeAccess parent = value instanceof ASTNodeAccessImpl
+                    ? ((ASTNodeAccessImpl) value).getParent()
+                    : null;
+            Node parentNode = parent == null ? null : parent.getASTNode();
+            if (parentNode != null && (parentNode.jjtGetFirstToken().absoluteBegin - 1 > range[0]
+                    || parentNode.jjtGetLastToken().absoluteEnd - 1 < range[1])) {
+                report("lies outside its parent " + parent.getClass().getSimpleName(), value);
+            }
+        }
+
+        private void checkReparses(Object value, String text, Parse parse) {
+            Object again;
+            try {
+                again = parse.apply(text);
+            } catch (JSQLParserException e) {
+                // text that needs its surroundings to parse proves nothing
+                return;
+            }
+            if (again != null
+                    && !normalized(again.toString()).equals(normalized(value.toString()))) {
+                report("reparses to something else", value, value + " reparses to " + again);
+            }
+        }
+
+        // sorted by start, the longer first, ranges nest when each ends inside the one still open
+        private void checkNoPartialOverlap() {
+            ranges.sort(Comparator.<Object[]>comparingInt(entry -> ((int[]) entry[0])[0])
+                    .thenComparingInt(entry -> -((int[]) entry[0])[1]));
+            Deque<Object[]> open = new ArrayDeque<>();
+            for (Object[] entry : ranges) {
+                int[] range = (int[]) entry[0];
+                while (!open.isEmpty() && ((int[]) open.peek()[0])[1] <= range[0]) {
+                    open.pop();
+                }
+                if (!open.isEmpty() && ((int[]) open.peek()[0])[1] < range[1]) {
+                    report("partly overlaps " + open.peek()[1].getClass().getSimpleName(),
+                            entry[1], entry[1]);
+                }
+                open.push(entry);
+            }
+        }
+
+        private void report(String problem, Object value) {
+            report(problem, value, value);
+        }
+
+        private void report(String problem, Object value, Object detail) {
+            problems.putIfAbsent(value.getClass().getSimpleName() + " " + problem,
+                    source + ": " + detail);
+        }
+    }
+
+    private interface Parse {
+        Object apply(String text) throws JSQLParserException;
+    }
+
+    private static String normalized(String text) {
+        return text.replaceAll("\\s+", "").toUpperCase(Locale.ROOT);
+    }
+
+    // a getter that builds new objects on each call computes them rather than holding them
+    @SuppressWarnings("PMD.CompareObjectsWithEquals")
+    private static boolean isHeld(Object child, Object again) {
+        if (child instanceof ASTNodeAccess) {
+            return child == again;
+        }
+        if (child instanceof Collection && !((Collection<?>) child).isEmpty()) {
+            return again instanceof Collection && !((Collection<?>) again).isEmpty()
+                    && ((Collection<?>) child).iterator().next() == ((Collection<?>) again)
+                            .iterator().next();
+        }
+        return true;
+    }
+
+    private static boolean isModel(Object value) {
+        String name = value.getClass().getName();
+        return name.startsWith("net.sf.jsqlparser.")
+                && !name.startsWith("net.sf.jsqlparser.parser.")
+                && !(value instanceof Enum);
+    }
+
+    private static boolean isChildGetter(Method method) {
+        return method.getParameterCount() == 0 && method.getName().startsWith("get")
+                && !Modifier.isStatic(method.getModifiers())
+                && !method.getName().equals("getParent") && !method.getName().equals("getASTNode");
+    }
+}
diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectASTTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectASTTest.java
index 5fd6a79301..f46c1a2384 100644
--- a/src/test/java/net/sf/jsqlparser/statement/select/SelectASTTest.java
+++ b/src/test/java/net/sf/jsqlparser/statement/select/SelectASTTest.java
@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.parser.ASTNodeAccess;
@@ -203,6 +204,27 @@ public void testBinaryConditionNodeStartsAtItsLeftOperand() throws JSQLParserExc
         }
     }
 
+    @Test
+    public void testOperatorExpressionNodeSpansItsOperands() throws JSQLParserException {
+        String sql = "SELECT a - 1 - 2, 1 + 2 * 3, a | | b FROM t WHERE d > CURRENT_DATE - 7";
+        PlainSelect select = (PlainSelect) CCJSqlParserUtil.parse(sql);
+        BinaryExpression chain = (BinaryExpression) select.getSelectItem(0).getExpression();
+        BinaryExpression precedence = (BinaryExpression) select.getSelectItem(1).getExpression();
+
+        assertEquals("a - 1 - 2", source(sql, chain));
+        assertEquals("a - 1", source(sql, chain.getLeftExpression()));
+        assertEquals("2 * 3", source(sql, precedence.getRightExpression()));
+        assertEquals("a | | b", source(sql, select.getSelectItem(2).getExpression()));
+        assertEquals("CURRENT_DATE - 7",
+                source(sql, ((BinaryExpression) select.getWhere()).getRightExpression()));
+    }
+
+    private static String source(String sql, Expression expression) {
+        Node node = expression.getASTNode();
+        return sql.substring(node.jjtGetFirstToken().absoluteBegin - 1,
+                node.jjtGetLastToken().absoluteEnd - 1);
+    }
+
     @Test
     public void testSelectASTExtractWithCommentsIssue1580() throws JSQLParserException {
         String sql =