From 7a411ff1920c30afe962b5598fd78222b24650d9 Mon Sep 17 00:00:00 2001
From: Javier Lores <lores.javier@gmail.com>
Date: Mon, 20 Jan 2025 16:33:05 -0500
Subject: [PATCH 1/9] expanded grammar and symbols for commands

---
 grammar/grammar.jjt                           |  581 +++-
 src/main/java/com/cinchapi/ccl/Compiler.java  |   24 +-
 .../java/com/cinchapi/ccl/CompilerJavaCC.java |   18 +-
 .../cinchapi/ccl/ConditionTreeVisitor.java    |   10 +-
 .../java/com/cinchapi/ccl/JavaCCParser.java   |    2 +-
 src/main/java/com/cinchapi/ccl/Parser.java    |    6 +-
 src/main/java/com/cinchapi/ccl/Parsing.java   |    4 +-
 .../cinchapi/ccl/generated/ASTCommand.java    |   23 +
 .../cinchapi/ccl/generated/ASTExpression.java |    4 +-
 .../cinchapi/ccl/generated/ASTFunction.java   |    2 +-
 .../com/cinchapi/ccl/generated/ASTOrder.java  |    2 +-
 .../com/cinchapi/ccl/generated/ASTPage.java   |    2 +-
 .../com/cinchapi/ccl/generated/Grammar.java   | 3098 ++++++++++++++---
 .../ccl/generated/GrammarConstants.java       |  183 +-
 .../ccl/generated/GrammarDefaultVisitor.java  |    5 +-
 .../ccl/generated/GrammarTokenManager.java    | 1150 ++++--
 .../ccl/generated/GrammarTreeConstants.java   |    4 +-
 .../ccl/generated/GrammarVisitor.java         |    3 +-
 .../{CommandSymbol.java => QuerySymbol.java}  |    4 +-
 .../cinchapi/ccl/grammar/TimestampSymbol.java |    1 +
 .../ccl/grammar/command/AbortSymbol.java      |   29 +
 .../ccl/grammar/command/AddSymbol.java        |   62 +
 .../ccl/grammar/command/AuditSymbol.java      |   52 +
 .../ccl/grammar/command/ClearSymbol.java      |   96 +
 .../ccl/grammar/command/CommandSymbol.java    |   28 +
 .../ccl/grammar/command/CommitSymbol.java     |   29 +
 .../ccl/grammar/command/DescribeSymbol.java   |   72 +
 .../ccl/grammar/command/FetchSymbol.java      |  108 +
 .../ccl/grammar/command/FindSymbol.java       |  100 +
 .../ccl/grammar/command/GetSymbol.java        |  108 +
 .../ccl/grammar/command/InsertSymbol.java     |   86 +
 .../ccl/grammar/command/LinkSymbol.java       |   61 +
 .../ccl/grammar/command/PingSymbol.java       |   64 +
 .../ccl/grammar/command/RemoveSymbol.java     |   63 +
 .../ccl/grammar/command/RevertSymbol.java     |  123 +
 .../ccl/grammar/command/SearchSymbol.java     |   50 +
 .../ccl/grammar/command/SelectSymbol.java     |   64 +
 .../ccl/grammar/command/SetSymbol.java        |   61 +
 .../ccl/grammar/command/StageSymbol.java      |   29 +
 .../ccl/grammar/command/UnlinkSymbol.java     |   61 +
 .../grammar/command/VerifyAndSwapSymbol.java  |   72 +
 .../grammar/command/VerifyOrSetSymbol.java    |   61 +
 .../ccl/grammar/command/VerifySymbol.java     |   75 +
 .../grammar/{ => condition}/Expression.java   |    6 +-
 .../{ => condition}/ExpressionSymbol.java     |    5 +-
 .../{ => condition}/FunctionKeySymbol.java    |    3 +-
 .../{ => condition}/FunctionTokenSymbol.java  |    3 +-
 .../{ => condition}/FunctionValueSymbol.java  |    3 +-
 .../{ => condition}/OperatorSymbol.java       |    4 +-
 .../{ => condition}/OrderComponentSymbol.java |    7 +-
 .../grammar/{ => condition}/OrderSymbol.java  |    3 +-
 .../grammar/{ => condition}/PageSymbol.java   |    4 +-
 .../ccl/syntax/BaseAbstractSyntaxTree.java    |    2 +-
 .../java/com/cinchapi/ccl/syntax/Visitor.java |    4 +-
 .../ccl/syntax/command/CommandTree.java       |   31 +
 .../ccl/syntax/{ => condition}/AndTree.java   |    3 +-
 .../syntax/{ => condition}/ConditionTree.java |    4 +-
 .../{ => condition}/ConjunctionTree.java      |    5 +-
 .../{ => condition}/ExpressionTree.java       |    7 +-
 .../syntax/{ => condition}/FunctionTree.java  |    7 +-
 .../ccl/syntax/{ => condition}/OrTree.java    |    3 +-
 .../ccl/syntax/{ => condition}/OrderTree.java |    7 +-
 .../ccl/syntax/{ => condition}/PageTree.java  |    7 +-
 .../QueryTree.java}                           |   19 +-
 .../ccl/type/function/KeyCclFunction.java     |    2 +-
 .../type/function/KeyConditionFunction.java   |    6 +-
 .../cinchapi/ccl/CompilerJavaCCLogicTest.java |   56 +-
 .../com/cinchapi/ccl/CompilerJavaCCTest.java  |    6 +-
 .../java/com/cinchapi/ccl/CompilerTest.java   |   24 +-
 .../java/com/cinchapi/ccl/GrammarTest.java    |   14 +-
 .../cinchapi/ccl/JavaCCParserLogicTest.java   |   16 +-
 .../com/cinchapi/ccl/JavaCCParserTest.java    |    4 +-
 .../java/com/cinchapi/ccl/ParserTest.java     |   18 +-
 .../com/cinchapi/ccl/syntax/VisitorTest.java  |    7 +-
 74 files changed, 5983 insertions(+), 987 deletions(-)
 create mode 100644 src/main/java/com/cinchapi/ccl/generated/ASTCommand.java
 rename src/main/java/com/cinchapi/ccl/grammar/{CommandSymbol.java => QuerySymbol.java} (87%)
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/AbortSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/ClearSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/CommandSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/CommitSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/DescribeSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/InsertSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/LinkSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/PingSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/RevertSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/SearchSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/SetSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/StageSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/UnlinkSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/VerifyAndSwapSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/VerifyOrSetSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/VerifySymbol.java
 rename src/main/java/com/cinchapi/ccl/grammar/{ => condition}/Expression.java (96%)
 rename src/main/java/com/cinchapi/ccl/grammar/{ => condition}/ExpressionSymbol.java (96%)
 rename src/main/java/com/cinchapi/ccl/grammar/{ => condition}/FunctionKeySymbol.java (92%)
 rename src/main/java/com/cinchapi/ccl/grammar/{ => condition}/FunctionTokenSymbol.java (91%)
 rename src/main/java/com/cinchapi/ccl/grammar/{ => condition}/FunctionValueSymbol.java (92%)
 rename src/main/java/com/cinchapi/ccl/grammar/{ => condition}/OperatorSymbol.java (92%)
 rename src/main/java/com/cinchapi/ccl/grammar/{ => condition}/OrderComponentSymbol.java (90%)
 rename src/main/java/com/cinchapi/ccl/grammar/{ => condition}/OrderSymbol.java (95%)
 rename src/main/java/com/cinchapi/ccl/grammar/{ => condition}/PageSymbol.java (96%)
 create mode 100644 src/main/java/com/cinchapi/ccl/syntax/command/CommandTree.java
 rename src/main/java/com/cinchapi/ccl/syntax/{ => condition}/AndTree.java (91%)
 rename src/main/java/com/cinchapi/ccl/syntax/{ => condition}/ConditionTree.java (88%)
 rename src/main/java/com/cinchapi/ccl/syntax/{ => condition}/ConjunctionTree.java (91%)
 rename src/main/java/com/cinchapi/ccl/syntax/{ => condition}/ExpressionTree.java (85%)
 rename src/main/java/com/cinchapi/ccl/syntax/{ => condition}/FunctionTree.java (76%)
 rename src/main/java/com/cinchapi/ccl/syntax/{ => condition}/OrTree.java (91%)
 rename src/main/java/com/cinchapi/ccl/syntax/{ => condition}/OrderTree.java (84%)
 rename src/main/java/com/cinchapi/ccl/syntax/{ => condition}/PageTree.java (84%)
 rename src/main/java/com/cinchapi/ccl/syntax/{CommandTree.java => condition/QueryTree.java} (83%)

diff --git a/grammar/grammar.jjt b/grammar/grammar.jjt
index d8d09a87..ad4586d2 100644
--- a/grammar/grammar.jjt
+++ b/grammar/grammar.jjt
@@ -27,25 +27,25 @@ package com.cinchapi.ccl.generated;
 
 import com.cinchapi.ccl.SyntaxException;
 import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
 import com.cinchapi.ccl.type.function.KeyRecordsFunction;
-import com.cinchapi.ccl.grammar.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
 import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
 import com.cinchapi.ccl.type.function.IndexFunction;
 import com.cinchapi.ccl.grammar.NavigationKeySymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.PageSymbol;
-import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.condition.PageSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderSymbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.util.NaturalLanguage;
 import com.cinchapi.common.base.AnyStrings;
@@ -109,6 +109,53 @@ SKIP :
   "\t"
 }
 
+TOKEN [IGNORE_CASE]:
+{
+  // Data modification commands
+  < ADD: "add" >
+| < SET: "set" >
+| < REMOVE: "remove" >
+| < CLEAR: "clear" >
+| < VERIFY_AND_SWAP: "verifyAndSwap" | "verify_and_swap" >
+| < VERIFY_OR_SET: "verifyOrSet" | "verify_or_set" >
+
+  // Record operations
+| < INSERT: "insert" >
+
+  // Link operations
+| < LINK: "link" >
+| < UNLINK: "unlink" >
+
+  // Query operations
+| < SELECT: "select" >
+| < FETCH: "fetch" >
+| < GET: "get" >
+| < DESCRIBE: "describe" >
+| < AUDIT: "audit" >
+| < VERIFY: "verify" >
+| < SEARCH: "search" >
+
+  // Transaction operations
+| < STAGE: "stage" >
+| < COMMIT: "commit" >
+| < ABORT: "abort" >
+
+  // Other tokens needed for command syntax
+| < REVERT: "revert" >
+| < IN: "in" >
+| < INTO: "into" >
+| < FROM: "from" >
+| < TO: "to" >
+| < AS: "as" >
+| < FOR: "for" >
+| < WITH: "with" >
+| < AS_OF: "as of" >
+| < OPEN_BRACE : "{" >
+| < CLOSE_BRACE : "}" >
+| < COLON : ":" >
+}
+
+
 TOKEN : { < OPEN_PARENTHESES : "(" > }
 TOKEN : { < CLOSE_PARENTHESES : ")" > }
 TOKEN : { < OPEN_BRACKET : "[" > }
@@ -205,6 +252,9 @@ TOKEN :
 ASTStart StartCommandLine() #Start : {}
 {
    ( LOOKAHEAD(4)
+     Command() "\n"
+   |
+     LOOKAHEAD(3)
      (<WHERE>)? DisjunctionExpression() (Order())? (Page())? "\n"
    |
      Page() "\n"
@@ -219,6 +269,9 @@ ASTStart StartCommandLine() #Start : {}
 ASTStart generateAST() #Start : {}
 {
    ( LOOKAHEAD(4)
+     Command() <EOF>
+   |
+     LOOKAHEAD(3)
      (<WHERE>)? DisjunctionExpression() (Order())? (Page())? <EOF>
    |
      Page() <EOF>
@@ -671,4 +724,516 @@ FunctionValueSymbol ValueFunction() :
         }
      )
    )
+}
+
+void Command() : {}
+{
+      DataModificationOperations()
+    |
+      RecordOperations()
+    |
+      LinkOperations()
+    |
+      QueryOperations()
+    |
+      TransactionOperations()
+    |
+      RevertCommand()
+}
+
+void DataModificationOperations() : {}
+{
+    AddCommand()
+  |
+    SetCommand()
+  |
+    RemoveCommand()
+  |
+    ClearCommand()
+  |
+    VerifyAndSwapCommand()
+  |
+    VerifyOrSetCommand()
+}
+
+void AddCommand() #Command :
+{
+    KeyTokenSymbol key;
+    ValueTokenSymbol value;
+    Token record;
+}
+{
+    <ADD> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
+    {
+        jjtThis.command(new AddSymbol(key, value, Long.parseLong(record.image)));
+    }
+}
+
+void SetCommand() #Command :
+{
+    KeyTokenSymbol key;
+    ValueTokenSymbol value;
+    Token record;
+}
+{
+    <SET> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
+    {
+        jjtThis.command(new SetSymbol(key, value, Long.parseLong(record.image)));
+    }
+}
+
+void RemoveCommand() #Command :
+{
+    KeyTokenSymbol key;
+    ValueTokenSymbol value = null;
+    Token record;
+}
+{
+    <REMOVE> key=Key() (<AS> value=UnaryValue())? (<FROM> | <IN>) record=<NUMERIC>
+    {
+        jjtThis.command(new RemoveSymbol(key, value, Long.parseLong(record.image)));
+    }
+}
+
+void ClearCommand() #Command :
+{
+    KeyTokenSymbol key = null;
+    Token record;
+    Collection<KeySymbol> keys = null;
+    Collection records = null;
+}
+{
+    <CLEAR>
+    (
+        LOOKAHEAD(3)
+        key=Key() <FROM> record=<NUMERIC>
+        {
+            jjtThis.command(new ClearSymbol(key, Long.parseLong(record.image)));
+        }
+      |
+        LOOKAHEAD(3)
+        key=Key() <FROM> records=RecordCollection()
+        {
+            jjtThis.command(new ClearSymbol(key, records));
+        }
+      |
+        LOOKAHEAD(3)
+        keys=KeyCollection() <FROM> record=<NUMERIC>
+        {
+            jjtThis.command(new ClearSymbol(keys, Long.parseLong(record.image)));
+        }
+      |
+        keys=KeyCollection() <FROM> records=RecordCollection()
+        {
+            jjtThis.command(new ClearSymbol(keys, records));
+        }
+    )
+}
+
+void VerifyAndSwapCommand() #Command :
+{
+    KeyTokenSymbol key;
+    ValueTokenSymbol expected;
+    ValueTokenSymbol replacement;
+    Token record;
+}
+{
+    <VERIFY_AND_SWAP> key=Key() <AS> expected=UnaryValue() <IN> record=<NUMERIC>
+    <WITH> replacement=UnaryValue()
+    {
+        jjtThis.command(new VerifyAndSwapSymbol(key, expected, replacement, Long.parseLong(record.image)));
+    }
+}
+
+void VerifyOrSetCommand() #Command :
+{
+    KeyTokenSymbol key;
+    ValueTokenSymbol value;
+    Token record;
+}
+{
+    <VERIFY_OR_SET> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
+    {
+        jjtThis.command(new VerifyOrSetSymbol(key, value, Long.parseLong(record.image)));
+    }
+}
+
+void RecordOperations() : {}
+{
+    InsertCommand()
+}
+
+void InsertCommand() #Command :
+{
+    String json;
+    Token record = null;
+    Collection records = null;
+}
+{
+    <INSERT> json=JsonObject()
+    (
+        (<IN> | <INTO>)
+        (
+            record=<NUMERIC>
+            {
+                jjtThis.command(new InsertSymbol(json, Long.parseLong(record.image)));
+            }
+          |
+            records=RecordCollection()
+            {
+                jjtThis.command(new InsertSymbol(json, records));
+            }
+        )
+    )?
+    {
+        if(record == null && records == null) {
+            jjtThis.command(new InsertSymbol(json));
+        }
+    }
+}
+
+void LinkOperations() : {}
+{
+    LinkCommand()
+  |
+    UnlinkCommand()
+}
+
+void LinkCommand() #Command :
+{
+    KeyTokenSymbol key;
+    Token source;
+    Token destination;
+    Collection destinations = null;
+}
+{
+    <LINK> key=Key() <FROM> source=<NUMERIC> <TO>
+    (
+        destination=<NUMERIC>
+        {
+            Collection dest = new ArrayList();
+            dest.add(Long.parseLong(destination.image));
+            jjtThis.command(new LinkSymbol(key, Long.parseLong(source.image), dest));
+        }
+      |
+        destinations=RecordCollection()
+        {
+            jjtThis.command(new LinkSymbol(key, Long.parseLong(source.image), destinations));
+        }
+    )
+}
+
+void UnlinkCommand() #Command :
+{
+    KeyTokenSymbol key;
+    Token source;
+    Token destination;
+    Collection destinations = null;
+}
+{
+    <UNLINK> key=Key() <FROM> source=<NUMERIC> <TO>
+    (
+        destination=<NUMERIC>
+        {
+            Collection dest = new ArrayList();
+            dest.add(Long.parseLong(destination.image));
+            jjtThis.command(new UnlinkSymbol(key, Long.parseLong(source.image), dest));
+        }
+      |
+        destinations=RecordCollection()
+        {
+            jjtThis.command(new UnlinkSymbol(key, Long.parseLong(source.image), destinations));
+        }
+    )
+}
+
+void QueryOperations() : {}
+{
+    SelectCommand()
+  |
+    FetchCommand()
+  |
+    GetCommand()
+  |
+    DescribeCommand()
+  |
+    AuditCommand()
+  |
+    VerifyCommand()
+  |
+    SearchCommand()
+}
+
+void SelectCommand() #Command :
+{
+    KeyTokenSymbol key;
+    Token record;
+    TimestampSymbol timestamp = null;
+}
+{
+    <SELECT> key=Key() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+    {
+        jjtThis.command(new SelectSymbol(key, Long.parseLong(record.image), timestamp));
+    }
+}
+
+void FetchCommand() #Command :
+{
+    KeyTokenSymbol key;
+    Collection<KeySymbol> keys = null;
+    Token record;
+    Collection records = null;
+    TimestampSymbol timestamp = null;
+}
+{
+    <FETCH>
+    (
+        LOOKAHEAD(3)
+        key=Key() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new FetchSymbol(key, Long.parseLong(record.image), timestamp));
+        }
+      |
+        LOOKAHEAD(3)
+        key=Key() <FROM> records=RecordCollection() (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new FetchSymbol(key, records, timestamp));
+        }
+      |
+        LOOKAHEAD(3)
+        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
+        }
+      |
+        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new FetchSymbol(keys, records, timestamp));
+        }
+    )
+}
+
+void GetCommand() #Command :
+{
+    KeyTokenSymbol key;
+    Collection<KeySymbol> keys = null;
+    Token record;
+    Collection records = null;
+    TimestampSymbol timestamp = null;
+}
+{
+    <GET>
+    (
+        LOOKAHEAD(3)
+        key=Key() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new GetSymbol(key, Long.parseLong(record.image), timestamp));
+        }
+      |
+        LOOKAHEAD(3)
+        key=Key() <FROM> records=RecordCollection() (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new GetSymbol(key, records, timestamp));
+        }
+      |
+        LOOKAHEAD(3)
+        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
+        }
+      |
+        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new GetSymbol(keys, records, timestamp));
+        }
+    )
+}
+
+void DescribeCommand() #Command :
+{
+    Token record;
+    Collection records = null;
+    TimestampSymbol timestamp = null;
+}
+{
+    <DESCRIBE>
+    (
+        LOOKAHEAD(2)
+        record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
+        }
+      |
+        records=RecordCollection() (timestamp=AsOfTimestamp())?
+        {
+            jjtThis.command(new DescribeSymbol(records, timestamp));
+        }
+    )
+}
+
+void AuditCommand() #Command :
+{
+    KeyTokenSymbol key = null;
+    Token record;
+}
+{
+    <AUDIT>
+    (
+        LOOKAHEAD(2)
+        key=Key() <FROM> record=<NUMERIC>
+        {
+            jjtThis.command(new AuditSymbol(key, Long.parseLong(record.image)));
+        }
+      |
+        record=<NUMERIC>
+        {
+            jjtThis.command(new AuditSymbol(null, Long.parseLong(record.image)));
+        }
+    )
+}
+
+void VerifyCommand() #Command :
+{
+    KeyTokenSymbol key;
+    ValueTokenSymbol value;
+    Token record;
+    TimestampSymbol timestamp = null;
+}
+{
+    <VERIFY> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
+    (timestamp=AsOfTimestamp())?
+    {
+        jjtThis.command(new VerifySymbol(key, value, Long.parseLong(record.image), timestamp));
+    }
+}
+
+void SearchCommand() #Command :
+{
+    KeyTokenSymbol key;
+    Token query;
+}
+{
+    <SEARCH> key=Key() <FOR> query=<QUOTED_STRING>
+    {
+        jjtThis.command(new SearchSymbol(key, query.image));
+    }
+}
+
+void TransactionOperations() : {}
+{
+    StageCommand()
+  |
+    CommitCommand()
+  |
+    AbortCommand()
+}
+
+void StageCommand() #Command : {}
+{
+    <STAGE>
+    {
+        jjtThis.command(StageSymbol.INSTANCE);
+    }
+}
+
+void CommitCommand() #Command : {}
+{
+    <COMMIT>
+    {
+        jjtThis.command(CommitSymbol.INSTANCE);
+    }
+}
+
+void AbortCommand() #Command : {}
+{
+    <ABORT>
+    {
+        jjtThis.command(AbortSymbol.INSTANCE);
+    }
+}
+
+void RevertCommand() #Command :
+{
+    KeyTokenSymbol key = null;
+    Token record = null;
+    Collection<KeySymbol> keys = null;
+    Collection records = null;
+    TimestampSymbol timestamp;
+}
+{
+    <REVERT>
+    (
+        LOOKAHEAD(3)
+        key=Key() <IN> record=<NUMERIC>
+        {
+            jjtThis.setType("REVERT");
+            jjtThis.setKey(key);
+            jjtThis.setRecord(Long.parseLong(record.image));
+        }
+      |
+        LOOKAHEAD(3)
+        key=Key() <IN> records=RecordCollection()
+        {
+            jjtThis.command(new RevertSymbol(key, records, timestamp));
+        }
+      |
+        LOOKAHEAD(3)
+        keys=KeyCollection() <IN> record=<NUMERIC>
+        {
+            jjtThis.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
+        }
+      |
+        keys=KeyCollection() <IN> records=RecordCollection()
+        {
+            jjtThis.command(new RevertSymbol(keys, records, timestamp));
+        }
+    )
+    <TO> timestamp=Timestamp()
+    { jjtThis.setTimestamp(timestamp); }
+}
+
+// Utility parsing rules
+Collection RecordCollection() :
+{
+    Token record;
+    Collection records = new ArrayList();
+}
+{
+    <OPEN_BRACKET>
+        record=<NUMERIC> { records.add(Long.parseLong(record.image)); }
+        (<COMMA> record=<NUMERIC> { records.add(Long.parseLong(record.image)); })*
+    <CLOSE_BRACKET>
+    { return records; }
+}
+
+Collection KeyCollection() :
+{
+    KeyTokenSymbol key;
+    Collection keys = new ArrayList();
+}
+{
+    <OPEN_BRACKET>
+        key=Key() { keys.add(key.toString()); }
+        (<COMMA> key=Key() { keys.add(key.toString()); })*
+    <CLOSE_BRACKET>
+    { return keys; }
+}
+
+String JsonObject() :
+{
+    Token content;
+}
+{
+    content=<QUOTED_STRING>
+    { return content.image; }
+}
+
+TimestampSymbol AsOfTimestamp() :
+{
+    Token word;
+    String timestamp = "";
+}
+{
+    <AS_OF> (LOOKAHEAD(2) (word=<QUOTED_STRING> | word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC>) { timestamp += (timestamp.equals("")) ? word.image : " " + word.image; })+
+    { return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp)); }
 }
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/Compiler.java b/src/main/java/com/cinchapi/ccl/Compiler.java
index be8c49e6..16e75c4b 100644
--- a/src/main/java/com/cinchapi/ccl/Compiler.java
+++ b/src/main/java/com/cinchapi/ccl/Compiler.java
@@ -22,26 +22,18 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import com.cinchapi.ccl.grammar.CommandSymbol;
+import com.cinchapi.ccl.grammar.QuerySymbol;
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.CommandTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
-import com.cinchapi.ccl.syntax.Visitor;
+import com.cinchapi.ccl.syntax.*;
+import com.cinchapi.ccl.syntax.condition.*;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.common.base.Verify;
 import com.cinchapi.common.function.TriFunction;
@@ -276,9 +268,9 @@ public final List<Symbol> tokenize(AbstractSyntaxTree ast) {
 
             @SuppressWarnings("unchecked")
             @Override
-            public List<Symbol> visit(CommandTree tree, Object... data) {
+            public List<Symbol> visit(QueryTree tree, Object... data) {
                 List<Symbol> symbols = (List<Symbol>) data[0];
-                if(tree.root() != CommandSymbol.IMPLICIT) {
+                if(tree.root() != QuerySymbol.IMPLICIT) {
                     symbols.add(tree.root());
                 }
                 for (AbstractSyntaxTree child : tree.children()) {
@@ -352,7 +344,7 @@ public List<Symbol> visit(PageTree tree, Object... data) {
             @SuppressWarnings("unchecked")
             @Override
             public List<Symbol> visit(FunctionTree tree,
-                    Object... data) {
+                                      Object... data) {
                 List<Symbol> symbols = (List<Symbol>) data[0];
                 symbols.add(tree.root());
                 return symbols;
diff --git a/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java b/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
index c04bfebd..bfafb102 100644
--- a/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
+++ b/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
@@ -31,14 +31,14 @@
 import com.cinchapi.ccl.generated.GrammarVisitor;
 import com.cinchapi.ccl.generated.SimpleNode;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.AndTree;
-import com.cinchapi.ccl.syntax.CommandTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
+import com.cinchapi.ccl.syntax.condition.AndTree;
+import com.cinchapi.ccl.syntax.condition.QueryTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ExpressionTree;
+import com.cinchapi.ccl.syntax.condition.FunctionTree;
+import com.cinchapi.ccl.syntax.condition.OrTree;
+import com.cinchapi.ccl.syntax.condition.OrderTree;
+import com.cinchapi.ccl.syntax.condition.PageTree;
 import com.cinchapi.ccl.type.Operator;
 import com.google.common.collect.Multimap;
 
@@ -117,7 +117,7 @@ else if(functionTree != null && conditionTree == null
                     else {
                         // If the statement has multiple elements, it is
                         // implicitly a command.
-                        return new CommandTree(conditionTree, pageTree,
+                        return new QueryTree(conditionTree, pageTree,
                                 orderTree);
                     }
 
diff --git a/src/main/java/com/cinchapi/ccl/ConditionTreeVisitor.java b/src/main/java/com/cinchapi/ccl/ConditionTreeVisitor.java
index e68bc2b2..769ed19c 100644
--- a/src/main/java/com/cinchapi/ccl/ConditionTreeVisitor.java
+++ b/src/main/java/com/cinchapi/ccl/ConditionTreeVisitor.java
@@ -15,12 +15,8 @@
  */
 package com.cinchapi.ccl;
 
-import com.cinchapi.ccl.syntax.CommandTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
-import com.cinchapi.ccl.syntax.Visitor;
+import com.cinchapi.ccl.syntax.*;
+import com.cinchapi.ccl.syntax.condition.*;
 
 /**
  * A {@link Visitor} that can only visit possible subtree types of a
@@ -32,7 +28,7 @@
 public abstract class ConditionTreeVisitor<T> implements Visitor<T> {
 
     @Override
-    public final T visit(CommandTree tree, Object... data) {
+    public final T visit(QueryTree tree, Object... data) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/JavaCCParser.java b/src/main/java/com/cinchapi/ccl/JavaCCParser.java
index 35e67739..b06222a4 100644
--- a/src/main/java/com/cinchapi/ccl/JavaCCParser.java
+++ b/src/main/java/com/cinchapi/ccl/JavaCCParser.java
@@ -17,7 +17,7 @@
 
 import com.cinchapi.ccl.generated.Grammar;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
diff --git a/src/main/java/com/cinchapi/ccl/Parser.java b/src/main/java/com/cinchapi/ccl/Parser.java
index 58b06ebb..e569514d 100644
--- a/src/main/java/com/cinchapi/ccl/Parser.java
+++ b/src/main/java/com/cinchapi/ccl/Parser.java
@@ -23,11 +23,11 @@
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.ThreadSafe;
 
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.common.base.Verify;
 import com.cinchapi.common.function.TriFunction;
@@ -220,7 +220,7 @@ public String ccl() {
      * @return {@code true} if the data is described by the criteria that has
      *         been parsed
      * @deprecated Use
-     *             {@link com.cinchapi.ccl.syntax.ConditionTree#evaluate(Multimap, TriFunction)}
+     *             {@link ConditionTree#evaluate(Multimap, TriFunction)}
      *             instead
      */
     @Deprecated
diff --git a/src/main/java/com/cinchapi/ccl/Parsing.java b/src/main/java/com/cinchapi/ccl/Parsing.java
index ae37d379..3e6c35c0 100644
--- a/src/main/java/com/cinchapi/ccl/Parsing.java
+++ b/src/main/java/com/cinchapi/ccl/Parsing.java
@@ -23,9 +23,9 @@
 import java.util.Queue;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTCommand.java b/src/main/java/com/cinchapi/ccl/generated/ASTCommand.java
new file mode 100644
index 00000000..201449a7
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTCommand.java
@@ -0,0 +1,23 @@
+/* Generated By:JJTree: Do not edit this line. ASTCommand.java Version 7.0 */
+/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+package com.cinchapi.ccl.generated;
+
+public
+class ASTCommand extends SimpleNode {
+  public ASTCommand(int id) {
+    super(id);
+  }
+
+  public ASTCommand(Grammar p, int id) {
+    super(p, id);
+  }
+
+
+  /** Accept the visitor. **/
+  public Object jjtAccept(GrammarVisitor visitor, Object data) {
+
+    return
+    visitor.visit(this, data);
+  }
+}
+/* JavaCC - OriginalChecksum=318455f51b5537991537d05250b83eb1 (do not edit this line) */
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTExpression.java b/src/main/java/com/cinchapi/ccl/generated/ASTExpression.java
index 20a2a3e8..2df2eaec 100644
--- a/src/main/java/com/cinchapi/ccl/generated/ASTExpression.java
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTExpression.java
@@ -15,8 +15,8 @@
  */
 package com.cinchapi.ccl.generated;
 
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTFunction.java b/src/main/java/com/cinchapi/ccl/generated/ASTFunction.java
index 77054ad9..05b61dd5 100644
--- a/src/main/java/com/cinchapi/ccl/generated/ASTFunction.java
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTFunction.java
@@ -15,7 +15,7 @@
  */
 package com.cinchapi.ccl.generated;
 
-import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
 
 /**
  * A node that representation a CCL function
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTOrder.java b/src/main/java/com/cinchapi/ccl/generated/ASTOrder.java
index f9261eab..4256320a 100644
--- a/src/main/java/com/cinchapi/ccl/generated/ASTOrder.java
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTOrder.java
@@ -15,7 +15,7 @@
  */
 package com.cinchapi.ccl.generated;
 
-import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderSymbol;
 
 /**
  * A node that representation a CCL Order
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTPage.java b/src/main/java/com/cinchapi/ccl/generated/ASTPage.java
index 53315c00..6ba991e5 100644
--- a/src/main/java/com/cinchapi/ccl/generated/ASTPage.java
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTPage.java
@@ -15,7 +15,7 @@
  */
 package com.cinchapi.ccl.generated;
 
-import com.cinchapi.ccl.grammar.PageSymbol;
+import com.cinchapi.ccl.grammar.condition.PageSymbol;
 
 /**
  * A node that representation a Page
diff --git a/src/main/java/com/cinchapi/ccl/generated/Grammar.java b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
index a9fd2128..ba0e7bf4 100644
--- a/src/main/java/com/cinchapi/ccl/generated/Grammar.java
+++ b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
@@ -4,25 +4,25 @@
 
 import com.cinchapi.ccl.SyntaxException;
 import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
 import com.cinchapi.ccl.type.function.KeyRecordsFunction;
-import com.cinchapi.ccl.grammar.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
 import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
 import com.cinchapi.ccl.type.function.IndexFunction;
 import com.cinchapi.ccl.grammar.NavigationKeySymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.PageSymbol;
-import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.condition.PageSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderSymbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.util.NaturalLanguage;
 import com.cinchapi.common.base.AnyStrings;
@@ -81,6 +81,9 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
   jjtree.openNodeScope(jjtn000);
     try {
       if (jj_2_1(4)) {
+        Command();
+        jj_consume_token(79);
+      } else if (jj_2_2(3)) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case WHERE:{
           jj_consume_token(WHERE);
@@ -110,18 +113,18 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
           jj_la1[2] = jj_gen;
           ;
         }
-        jj_consume_token(48);
+        jj_consume_token(79);
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case PAGE:
         case SIZE:{
           Page();
-          jj_consume_token(48);
+          jj_consume_token(79);
           break;
           }
         case ORDER:{
           Order();
-          jj_consume_token(48);
+          jj_consume_token(79);
           break;
           }
         case NUMERIC:
@@ -130,7 +133,7 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
         case ALPHANUMERIC:
         case PERIOD_SEPARATED_STRING:{
           Function();
-          jj_consume_token(48);
+          jj_consume_token(79);
           break;
           }
         default:
@@ -169,7 +172,10 @@ final public ASTStart generateAST() throws ParseException {/*@bgen(jjtree) Start
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
     try {
-      if (jj_2_2(4)) {
+      if (jj_2_3(4)) {
+        Command();
+        jj_consume_token(0);
+      } else if (jj_2_4(3)) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case WHERE:{
           jj_consume_token(WHERE);
@@ -498,7 +504,7 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
 
   final public KeyTokenSymbol Key() throws ParseException {FunctionKeySymbol function;
   Token key;
-    if (jj_2_3(2)) {
+    if (jj_2_5(2)) {
       function = KeyFunction();
 {if ("" != null) return function;}
     } else {
@@ -557,7 +563,7 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
   String value = "";
   List<String> records = Lists.newArrayList();
   ASTStart ccl;
-    if (jj_2_5(2)) {
+    if (jj_2_7(2)) {
       function = ValueFunction();
 {if ("" != null) return function;}
     } else {
@@ -601,7 +607,7 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
             throw new ParseException();
           }
 value += (value.equals("")) ? word.image : " " + word.image;
-          if (jj_2_4(2)) {
+          if (jj_2_6(2)) {
             ;
           } else {
             break label_3;
@@ -683,12 +689,12 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 49:{
-          word = jj_consume_token(49);
+        case 80:{
+          word = jj_consume_token(80);
           break;
           }
-        case 50:{
-          word = jj_consume_token(50);
+        case 81:{
+          word = jj_consume_token(81);
           break;
           }
         default:
@@ -705,7 +711,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         else {
             value += " " + word.image;
         }
-        if (jj_2_6(4)) {
+        if (jj_2_8(4)) {
           ;
         } else {
           break label_4;
@@ -721,8 +727,8 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
     case ALPHANUMERIC:
     case PERIOD_SEPARATED_STRING:
     case NON_ALPHANUMERIC_AND_ALPHANUMERIC:
-    case 49:
-    case 50:{
+    case 80:
+    case 81:{
       label_5:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -750,12 +756,12 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 49:{
-          word = jj_consume_token(49);
+        case 80:{
+          word = jj_consume_token(80);
           break;
           }
-        case 50:{
-          word = jj_consume_token(50);
+        case 81:{
+          word = jj_consume_token(81);
           break;
           }
         default:
@@ -772,7 +778,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         else {
             value += " " + word.image;
         }
-        if (jj_2_7(3)) {
+        if (jj_2_9(3)) {
           ;
         } else {
           break label_5;
@@ -800,7 +806,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
   String value = "";
   List<String> records = Lists.newArrayList();
   ASTStart ccl;
-    if (jj_2_8(2)) {
+    if (jj_2_10(2)) {
       function = ValueFunction();
 {if ("" != null) return function;}
     } else {
@@ -978,7 +984,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         throw new ParseException();
       }
 timestamp += (timestamp.equals("")) ? word.image : " " + word.image;
-      if (jj_2_9(2)) {
+      if (jj_2_11(2)) {
         ;
       } else {
         break label_6;
@@ -1221,7 +1227,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);FunctionTokenSymbol function;
     try {
-      if (jj_2_10(2)) {
+      if (jj_2_12(2)) {
         function = KeyFunction();
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -1301,7 +1307,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
   TimestampSymbol timestamp = null;
     function = jj_consume_token(ALPHANUMERIC);
     jj_consume_token(OPEN_PARENTHESES);
-    if (jj_2_11(3)) {
+    if (jj_2_13(3)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SIGNED_INTEGER:{
         key = jj_consume_token(SIGNED_INTEGER);
@@ -1342,7 +1348,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         jj_consume_token(-1);
         throw new ParseException();
       }
-    } else if (jj_2_12(3)) {
+    } else if (jj_2_14(3)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SIGNED_INTEGER:{
         key = jj_consume_token(SIGNED_INTEGER);
@@ -1534,745 +1540,2791 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
     throw new Error("Missing return statement in function");
 }
 
-  private boolean jj_2_1(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_1()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(0, xla); }
-  }
-
-  private boolean jj_2_2(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_2()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(1, xla); }
-  }
-
-  private boolean jj_2_3(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_3()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(2, xla); }
-  }
-
-  private boolean jj_2_4(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_4()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(3, xla); }
-  }
-
-  private boolean jj_2_5(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_5()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(4, xla); }
-  }
-
-  private boolean jj_2_6(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_6()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(5, xla); }
-  }
-
-  private boolean jj_2_7(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_7()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(6, xla); }
-  }
-
-  private boolean jj_2_8(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_8()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(7, xla); }
-  }
-
-  private boolean jj_2_9(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_9()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(8, xla); }
-  }
-
-  private boolean jj_2_10(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_10()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(9, xla); }
-  }
-
-  private boolean jj_2_11(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_11()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(10, xla); }
-  }
-
-  private boolean jj_2_12(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_12()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(11, xla); }
-  }
-
-  private boolean jj_3R_39()
- {
-    if (jj_3R_51()) return true;
-    if (jj_3R_52()) return true;
-    if (jj_3R_52()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_38()
- {
-    if (jj_3R_48()) return true;
-    if (jj_3R_49()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_50()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_20()
- {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_37()
- {
-    if (jj_3R_45()) return true;
-    if (jj_3R_46()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_47()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_36()
- {
-    if (jj_3R_42()) return true;
-    if (jj_3R_43()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_44()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_48()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(12)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(14)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(15)) return true;
-    }
+  final public void Command() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ADD:
+    case SET:
+    case REMOVE:
+    case CLEAR:
+    case VERIFY_AND_SWAP:
+    case VERIFY_OR_SET:{
+      DataModificationOperations();
+      break;
+      }
+    case INSERT:{
+      RecordOperations();
+      break;
+      }
+    case LINK:
+    case UNLINK:{
+      LinkOperations();
+      break;
+      }
+    case SELECT:
+    case FETCH:
+    case GET:
+    case DESCRIBE:
+    case AUDIT:
+    case VERIFY:
+    case SEARCH:{
+      QueryOperations();
+      break;
+      }
+    case STAGE:
+    case COMMIT:
+    case ABORT:{
+      TransactionOperations();
+      break;
+      }
+    case REVERT:{
+      RevertCommand();
+      break;
+      }
+    default:
+      jj_la1[52] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
-    return false;
-  }
+}
 
-  private boolean jj_3R_19()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(37)) return true;
+  final public void DataModificationOperations() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ADD:{
+      AddCommand();
+      break;
+      }
+    case SET:{
+      SetCommand();
+      break;
+      }
+    case REMOVE:{
+      RemoveCommand();
+      break;
+      }
+    case CLEAR:{
+      ClearCommand();
+      break;
+      }
+    case VERIFY_AND_SWAP:{
+      VerifyAndSwapCommand();
+      break;
+      }
+    case VERIFY_OR_SET:{
+      VerifyOrSetCommand();
+      break;
+      }
+    default:
+      jj_la1[53] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
-    return false;
-  }
+}
 
-  private boolean jj_3R_53()
- {
-    if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    Token xsp;
-    if (jj_3_6()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_6()) { jj_scanpos = xsp; break; }
+  final public void AddCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    ValueTokenSymbol value;
+    Token record;
+    try {
+      jj_consume_token(ADD);
+      key = Key();
+      jj_consume_token(AS);
+      value = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(new AddSymbol(key, value, Long.parseLong(record.image)));
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
-    return false;
-  }
+}
 
-  private boolean jj_3R_46()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_53()) {
-    jj_scanpos = xsp;
-    if (jj_3R_54()) {
-    jj_scanpos = xsp;
-    if (jj_3R_55()) return true;
-    }
+  final public void SetCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    ValueTokenSymbol value;
+    Token record;
+    try {
+      jj_consume_token(SET);
+      key = Key();
+      jj_consume_token(AS);
+      value = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(new SetSymbol(key, value, Long.parseLong(record.image)));
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
     }
-    return false;
-  }
+}
 
-  private boolean jj_3R_14()
+  final public void RemoveCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    ValueTokenSymbol value = null;
+    Token record;
+    try {
+      jj_consume_token(REMOVE);
+      key = Key();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case AS:{
+        jj_consume_token(AS);
+        value = UnaryValue();
+        break;
+        }
+      default:
+        jj_la1[54] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case FROM:{
+        jj_consume_token(FROM);
+        break;
+        }
+      case IN:{
+        jj_consume_token(IN);
+        break;
+        }
+      default:
+        jj_la1[55] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      record = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(new RemoveSymbol(key, value, Long.parseLong(record.image)));
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void ClearCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
+    Token record;
+    Collection<KeySymbol> keys = null;
+    Collection records = null;
+    try {
+      jj_consume_token(CLEAR);
+      if (jj_2_15(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new ClearSymbol(key, Long.parseLong(record.image)));
+      } else if (jj_2_16(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        records = RecordCollection();
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new ClearSymbol(key, records));
+      } else if (jj_2_17(3)) {
+        keys = KeyCollection();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new ClearSymbol(keys, Long.parseLong(record.image)));
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
+          keys = KeyCollection();
+          jj_consume_token(FROM);
+          records = RecordCollection();
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new ClearSymbol(keys, records));
+          break;
+          }
+        default:
+          jj_la1[56] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void VerifyAndSwapCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    ValueTokenSymbol expected;
+    ValueTokenSymbol replacement;
+    Token record;
+    try {
+      jj_consume_token(VERIFY_AND_SWAP);
+      key = Key();
+      jj_consume_token(AS);
+      expected = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
+      jj_consume_token(WITH);
+      replacement = UnaryValue();
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(new VerifyAndSwapSymbol(key, expected, replacement, Long.parseLong(record.image)));
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void VerifyOrSetCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    ValueTokenSymbol value;
+    Token record;
+    try {
+      jj_consume_token(VERIFY_OR_SET);
+      key = Key();
+      jj_consume_token(AS);
+      value = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(new VerifyOrSetSymbol(key, value, Long.parseLong(record.image)));
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void RecordOperations() throws ParseException {
+    InsertCommand();
+}
+
+  final public void InsertCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);String json;
+    Token record = null;
+    Collection records = null;
+    try {
+      jj_consume_token(INSERT);
+      json = JsonObject();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case INTO:{
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:{
+          jj_consume_token(IN);
+          break;
+          }
+        case INTO:{
+          jj_consume_token(INTO);
+          break;
+          }
+        default:
+          jj_la1[57] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case NUMERIC:{
+          record = jj_consume_token(NUMERIC);
+jjtn000.command(new InsertSymbol(json, Long.parseLong(record.image)));
+          break;
+          }
+        case OPEN_BRACKET:{
+          records = RecordCollection();
+jjtn000.command(new InsertSymbol(json, records));
+          break;
+          }
+        default:
+          jj_la1[58] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+        break;
+        }
+      default:
+        jj_la1[59] = jj_gen;
+        ;
+      }
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+if(record == null && records == null) {
+            jjtn000.command(new InsertSymbol(json));
+        }
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void LinkOperations() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LINK:{
+      LinkCommand();
+      break;
+      }
+    case UNLINK:{
+      UnlinkCommand();
+      break;
+      }
+    default:
+      jj_la1[60] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+}
+
+  final public void LinkCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    Token source;
+    Token destination;
+    Collection destinations = null;
+    try {
+      jj_consume_token(LINK);
+      key = Key();
+      jj_consume_token(FROM);
+      source = jj_consume_token(NUMERIC);
+      jj_consume_token(TO);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMERIC:{
+        destination = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+Collection dest = new ArrayList();
+            dest.add(Long.parseLong(destination.image));
+            jjtn000.command(new LinkSymbol(key, Long.parseLong(source.image), dest));
+        break;
+        }
+      case OPEN_BRACKET:{
+        destinations = RecordCollection();
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new LinkSymbol(key, Long.parseLong(source.image), destinations));
+        break;
+        }
+      default:
+        jj_la1[61] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void UnlinkCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    Token source;
+    Token destination;
+    Collection destinations = null;
+    try {
+      jj_consume_token(UNLINK);
+      key = Key();
+      jj_consume_token(FROM);
+      source = jj_consume_token(NUMERIC);
+      jj_consume_token(TO);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMERIC:{
+        destination = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+Collection dest = new ArrayList();
+            dest.add(Long.parseLong(destination.image));
+            jjtn000.command(new UnlinkSymbol(key, Long.parseLong(source.image), dest));
+        break;
+        }
+      case OPEN_BRACKET:{
+        destinations = RecordCollection();
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new UnlinkSymbol(key, Long.parseLong(source.image), destinations));
+        break;
+        }
+      default:
+        jj_la1[62] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void QueryOperations() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case SELECT:{
+      SelectCommand();
+      break;
+      }
+    case FETCH:{
+      FetchCommand();
+      break;
+      }
+    case GET:{
+      GetCommand();
+      break;
+      }
+    case DESCRIBE:{
+      DescribeCommand();
+      break;
+      }
+    case AUDIT:{
+      AuditCommand();
+      break;
+      }
+    case VERIFY:{
+      VerifyCommand();
+      break;
+      }
+    case SEARCH:{
+      SearchCommand();
+      break;
+      }
+    default:
+      jj_la1[63] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+}
+
+  final public void SelectCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    Token record;
+    TimestampSymbol timestamp = null;
+    try {
+      jj_consume_token(SELECT);
+      key = Key();
+      jj_consume_token(FROM);
+      record = jj_consume_token(NUMERIC);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case AS_OF:{
+        timestamp = AsOfTimestamp();
+        break;
+        }
+      default:
+        jj_la1[64] = jj_gen;
+        ;
+      }
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(new SelectSymbol(key, Long.parseLong(record.image), timestamp));
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void FetchCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    Collection<KeySymbol> keys = null;
+    Token record;
+    Collection records = null;
+    TimestampSymbol timestamp = null;
+    try {
+      jj_consume_token(FETCH);
+      if (jj_2_18(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case AS_OF:{
+          timestamp = AsOfTimestamp();
+          break;
+          }
+        default:
+          jj_la1[65] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new FetchSymbol(key, Long.parseLong(record.image), timestamp));
+      } else if (jj_2_19(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        records = RecordCollection();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case AS_OF:{
+          timestamp = AsOfTimestamp();
+          break;
+          }
+        default:
+          jj_la1[66] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new FetchSymbol(key, records, timestamp));
+      } else if (jj_2_20(3)) {
+        keys = KeyCollection();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case AS_OF:{
+          timestamp = AsOfTimestamp();
+          break;
+          }
+        default:
+          jj_la1[67] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
+          keys = KeyCollection();
+          jj_consume_token(FROM);
+          records = RecordCollection();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case AS_OF:{
+            timestamp = AsOfTimestamp();
+            break;
+            }
+          default:
+            jj_la1[68] = jj_gen;
+            ;
+          }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new FetchSymbol(keys, records, timestamp));
+          break;
+          }
+        default:
+          jj_la1[69] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void GetCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    Collection<KeySymbol> keys = null;
+    Token record;
+    Collection records = null;
+    TimestampSymbol timestamp = null;
+    try {
+      jj_consume_token(GET);
+      if (jj_2_21(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case AS_OF:{
+          timestamp = AsOfTimestamp();
+          break;
+          }
+        default:
+          jj_la1[70] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new GetSymbol(key, Long.parseLong(record.image), timestamp));
+      } else if (jj_2_22(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        records = RecordCollection();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case AS_OF:{
+          timestamp = AsOfTimestamp();
+          break;
+          }
+        default:
+          jj_la1[71] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new GetSymbol(key, records, timestamp));
+      } else if (jj_2_23(3)) {
+        keys = KeyCollection();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case AS_OF:{
+          timestamp = AsOfTimestamp();
+          break;
+          }
+        default:
+          jj_la1[72] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
+          keys = KeyCollection();
+          jj_consume_token(FROM);
+          records = RecordCollection();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case AS_OF:{
+            timestamp = AsOfTimestamp();
+            break;
+            }
+          default:
+            jj_la1[73] = jj_gen;
+            ;
+          }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new GetSymbol(keys, records, timestamp));
+          break;
+          }
+        default:
+          jj_la1[74] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void DescribeCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);Token record;
+    Collection records = null;
+    TimestampSymbol timestamp = null;
+    try {
+      jj_consume_token(DESCRIBE);
+      if (jj_2_24(2)) {
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case AS_OF:{
+          timestamp = AsOfTimestamp();
+          break;
+          }
+        default:
+          jj_la1[75] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
+          records = RecordCollection();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case AS_OF:{
+            timestamp = AsOfTimestamp();
+            break;
+            }
+          default:
+            jj_la1[76] = jj_gen;
+            ;
+          }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new DescribeSymbol(records, timestamp));
+          break;
+          }
+        default:
+          jj_la1[77] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void AuditCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
+    Token record;
+    try {
+      jj_consume_token(AUDIT);
+      if (jj_2_25(2)) {
+        key = Key();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new AuditSymbol(key, Long.parseLong(record.image)));
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case NUMERIC:{
+          record = jj_consume_token(NUMERIC);
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new AuditSymbol(null, Long.parseLong(record.image)));
+          break;
+          }
+        default:
+          jj_la1[78] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void VerifyCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    ValueTokenSymbol value;
+    Token record;
+    TimestampSymbol timestamp = null;
+    try {
+      jj_consume_token(VERIFY);
+      key = Key();
+      jj_consume_token(AS);
+      value = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case AS_OF:{
+        timestamp = AsOfTimestamp();
+        break;
+        }
+      default:
+        jj_la1[79] = jj_gen;
+        ;
+      }
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(new VerifySymbol(key, value, Long.parseLong(record.image), timestamp));
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void SearchCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    Token query;
+    try {
+      jj_consume_token(SEARCH);
+      key = Key();
+      jj_consume_token(FOR);
+      query = jj_consume_token(QUOTED_STRING);
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(new SearchSymbol(key, query.image));
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void TransactionOperations() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case STAGE:{
+      StageCommand();
+      break;
+      }
+    case COMMIT:{
+      CommitCommand();
+      break;
+      }
+    case ABORT:{
+      AbortCommand();
+      break;
+      }
+    default:
+      jj_la1[80] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+}
+
+  final public void StageCommand() throws ParseException {/*@bgen(jjtree) Command */
+  ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+    try {
+      jj_consume_token(STAGE);
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(StageSymbol.INSTANCE);
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void CommitCommand() throws ParseException {/*@bgen(jjtree) Command */
+  ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+    try {
+      jj_consume_token(COMMIT);
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(CommitSymbol.INSTANCE);
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void AbortCommand() throws ParseException {/*@bgen(jjtree) Command */
+  ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+  boolean jjtc000 = true;
+  jjtree.openNodeScope(jjtn000);
+    try {
+      jj_consume_token(ABORT);
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(AbortSymbol.INSTANCE);
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+  final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
+    Token record = null;
+    Collection<KeySymbol> keys = null;
+    Collection records = null;
+    TimestampSymbol timestamp;
+    try {
+      jj_consume_token(REVERT);
+      if (jj_2_26(3)) {
+        key = Key();
+        jj_consume_token(IN);
+        record = jj_consume_token(NUMERIC);
+jjtn000.setType("REVERT");
+            jjtn000.setKey(key);
+            jjtn000.setRecord(Long.parseLong(record.image));
+      } else if (jj_2_27(3)) {
+        key = Key();
+        jj_consume_token(IN);
+        records = RecordCollection();
+jjtn000.command(new RevertSymbol(key, records, timestamp));
+      } else if (jj_2_28(3)) {
+        keys = KeyCollection();
+        jj_consume_token(IN);
+        record = jj_consume_token(NUMERIC);
+jjtn000.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
+          keys = KeyCollection();
+          jj_consume_token(IN);
+          records = RecordCollection();
+jjtn000.command(new RevertSymbol(keys, records, timestamp));
+          break;
+          }
+        default:
+          jj_la1[81] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+      jj_consume_token(TO);
+      timestamp = Timestamp();
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.setTimestamp(timestamp);
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
+      }
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
+      }
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
+      }
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
+      }
+    }
+}
+
+// Utility parsing rules
+  final public Collection RecordCollection() throws ParseException {Token record;
+    Collection records = new ArrayList();
+    jj_consume_token(OPEN_BRACKET);
+    record = jj_consume_token(NUMERIC);
+records.add(Long.parseLong(record.image));
+    label_10:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[82] = jj_gen;
+        break label_10;
+      }
+      jj_consume_token(COMMA);
+      record = jj_consume_token(NUMERIC);
+records.add(Long.parseLong(record.image));
+    }
+    jj_consume_token(CLOSE_BRACKET);
+{if ("" != null) return records;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public Collection KeyCollection() throws ParseException {KeyTokenSymbol key;
+    Collection keys = new ArrayList();
+    jj_consume_token(OPEN_BRACKET);
+    key = Key();
+keys.add(key.toString());
+    label_11:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[83] = jj_gen;
+        break label_11;
+      }
+      jj_consume_token(COMMA);
+      key = Key();
+keys.add(key.toString());
+    }
+    jj_consume_token(CLOSE_BRACKET);
+{if ("" != null) return keys;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public String JsonObject() throws ParseException {Token content;
+    content = jj_consume_token(QUOTED_STRING);
+{if ("" != null) return content.image;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public TimestampSymbol AsOfTimestamp() throws ParseException {Token word;
+    String timestamp = "";
+    jj_consume_token(AS_OF);
+    label_12:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case QUOTED_STRING:{
+        word = jj_consume_token(QUOTED_STRING);
+        break;
+        }
+      case SIGNED_INTEGER:{
+        word = jj_consume_token(SIGNED_INTEGER);
+        break;
+        }
+      case SIGNED_DECIMAL:{
+        word = jj_consume_token(SIGNED_DECIMAL);
+        break;
+        }
+      case NUMERIC:{
+        word = jj_consume_token(NUMERIC);
+        break;
+        }
+      case ALPHANUMERIC:{
+        word = jj_consume_token(ALPHANUMERIC);
+        break;
+        }
+      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+        word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+        break;
+        }
+      default:
+        jj_la1[84] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+timestamp += (timestamp.equals("")) ? word.image : " " + word.image;
+      if (jj_2_29(2)) {
+        ;
+      } else {
+        break label_12;
+      }
+    }
+{if ("" != null) return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp));}
+    throw new Error("Missing return statement in function");
+}
+
+  private boolean jj_2_1(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_1()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(0, xla); }
+  }
+
+  private boolean jj_2_2(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_2()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(1, xla); }
+  }
+
+  private boolean jj_2_3(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_3()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(2, xla); }
+  }
+
+  private boolean jj_2_4(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_4()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(3, xla); }
+  }
+
+  private boolean jj_2_5(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_5()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(4, xla); }
+  }
+
+  private boolean jj_2_6(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_6()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(5, xla); }
+  }
+
+  private boolean jj_2_7(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_7()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(6, xla); }
+  }
+
+  private boolean jj_2_8(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_8()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(7, xla); }
+  }
+
+  private boolean jj_2_9(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_9()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(8, xla); }
+  }
+
+  private boolean jj_2_10(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_10()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(9, xla); }
+  }
+
+  private boolean jj_2_11(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_11()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(10, xla); }
+  }
+
+  private boolean jj_2_12(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_12()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(11, xla); }
+  }
+
+  private boolean jj_2_13(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_13()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(12, xla); }
+  }
+
+  private boolean jj_2_14(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_14()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(13, xla); }
+  }
+
+  private boolean jj_2_15(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_15()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(14, xla); }
+  }
+
+  private boolean jj_2_16(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_16()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(15, xla); }
+  }
+
+  private boolean jj_2_17(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_17()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(16, xla); }
+  }
+
+  private boolean jj_2_18(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_18()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(17, xla); }
+  }
+
+  private boolean jj_2_19(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_19()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(18, xla); }
+  }
+
+  private boolean jj_2_20(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_20()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(19, xla); }
+  }
+
+  private boolean jj_2_21(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_21()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(20, xla); }
+  }
+
+  private boolean jj_2_22(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_22()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(21, xla); }
+  }
+
+  private boolean jj_2_23(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_23()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(22, xla); }
+  }
+
+  private boolean jj_2_24(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_24()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(23, xla); }
+  }
+
+  private boolean jj_2_25(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_25()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(24, xla); }
+  }
+
+  private boolean jj_2_26(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_26()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(25, xla); }
+  }
+
+  private boolean jj_2_27(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_27()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(26, xla); }
+  }
+
+  private boolean jj_2_28(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_28()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(27, xla); }
+  }
+
+  private boolean jj_2_29(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_29()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(28, xla); }
+  }
+
+  private boolean jj_3R_65()
+ {
+    if (jj_3R_86()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_49()
+ {
+    if (jj_3R_71()) return true;
+    return false;
+  }
+
+  private boolean jj_3_6()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_48()
+ {
+    if (jj_3R_70()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_100()
+ {
+    Token xsp;
+    if (jj_3_6()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_6()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_47()
+ {
+    if (jj_3R_69()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_83()
+ {
+    if (jj_scan_token(STAGE)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_46()
+ {
+    if (jj_3R_68()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_45()
+ {
+    if (jj_3R_67()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_87()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_7()) {
+    jj_scanpos = xsp;
+    if (jj_3R_100()) {
+    jj_scanpos = xsp;
+    if (jj_3R_101()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3_7()
+ {
+    if (jj_3R_16()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_62()
+ {
+    if (jj_3R_85()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_37()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_44()) {
+    jj_scanpos = xsp;
+    if (jj_3R_45()) {
+    jj_scanpos = xsp;
+    if (jj_3R_46()) {
+    jj_scanpos = xsp;
+    if (jj_3R_47()) {
+    jj_scanpos = xsp;
+    if (jj_3R_48()) {
+    jj_scanpos = xsp;
+    if (jj_3R_49()) return true;
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_44()
+ {
+    if (jj_3R_66()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_61()
+ {
+    if (jj_3R_84()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_75()
+ {
+    if (jj_scan_token(UNLINK)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_30()
+ {
+    if (jj_3R_42()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_60()
+ {
+    if (jj_3R_83()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_41()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_60()) {
+    jj_scanpos = xsp;
+    if (jj_3R_61()) {
+    jj_scanpos = xsp;
+    if (jj_3R_62()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_29()
+ {
+    if (jj_3R_41()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_28()
+ {
+    if (jj_3R_40()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_27()
+ {
+    if (jj_3R_39()) return true;
+    return false;
+  }
+
+  private boolean jj_3_11()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(65)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) return true;
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_26()
+ {
+    if (jj_3R_38()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_82()
+ {
+    if (jj_scan_token(SEARCH)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FOR)) return true;
+    if (jj_scan_token(QUOTED_STRING)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_34()
+ {
+    if (jj_scan_token(PERIOD_SEPARATED_STRING)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_13()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_25()) {
+    jj_scanpos = xsp;
+    if (jj_3R_26()) {
+    jj_scanpos = xsp;
+    if (jj_3R_27()) {
+    jj_scanpos = xsp;
+    if (jj_3R_28()) {
+    jj_scanpos = xsp;
+    if (jj_3R_29()) {
+    jj_scanpos = xsp;
+    if (jj_3R_30()) return true;
+    }
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_25()
+ {
+    if (jj_3R_37()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_33()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(40)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3_5()
+ {
+    if (jj_3R_15()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_21()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_5()) {
+    jj_scanpos = xsp;
+    if (jj_3R_33()) {
+    jj_scanpos = xsp;
+    if (jj_3R_34()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_32()
+ {
+    if (jj_scan_token(TIMESTAMP)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_81()
+ {
+    if (jj_scan_token(VERIFY)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(AS)) return true;
+    if (jj_3R_87()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_74()
+ {
+    if (jj_scan_token(LINK)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_107()
+ {
+    if (jj_scan_token(BINARY_OPERATOR)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_99()
+ {
+    if (jj_3R_107()) return true;
+    if (jj_3R_108()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_98()
+ {
+    if (jj_3R_106()) return true;
+    if (jj_3R_87()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_97()
+ {
+    if (jj_3R_104()) return true;
+    if (jj_3R_105()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_95()
+ {
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_20()
+ {
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_96()
+ {
+    if (jj_3R_102()) return true;
+    if (jj_3R_103()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_52()
+ {
+    if (jj_3R_75()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_106()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(43)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(45)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(46)) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_39()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_51()) {
+    jj_scanpos = xsp;
+    if (jj_3R_52()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_51()
+ {
+    if (jj_3R_74()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_19()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3_25()
+ {
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_86()
+ {
+    if (jj_3R_21()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_96()) {
+    jj_scanpos = xsp;
+    if (jj_3R_97()) {
+    jj_scanpos = xsp;
+    if (jj_3R_98()) {
+    jj_scanpos = xsp;
+    if (jj_3R_99()) return true;
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_24()
+ {
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_91()
+ {
+    if (jj_3R_22()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_104()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(54)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(55)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(56)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(57)) return true;
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_80()
+ {
+    if (jj_scan_token(AUDIT)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_25()) {
+    jj_scanpos = xsp;
+    if (jj_3R_95()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_18()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_32()) return true;
+    return false;
+  }
+
+  private boolean jj_3_14()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
+    }
+    }
+    }
+    if (jj_scan_token(COMMA)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_19()) {
+    jj_scanpos = xsp;
+    if (jj_3R_20()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_17()
  {
-    if (jj_3R_24()) return true;
+    if (jj_scan_token(CLOSE_PARENTHESES)) return true;
     return false;
   }
 
-  private boolean jj_3R_27()
+  private boolean jj_3R_90()
  {
-    if (jj_scan_token(CONJUNCTION)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_22()
+  private boolean jj_3R_102()
  {
-    if (jj_scan_token(DISJUNCTION)) return true;
+    if (jj_scan_token(LINKS_TO)) return true;
     return false;
   }
 
-  private boolean jj_3R_34()
+  private boolean jj_3R_94()
+ {
+    if (jj_3R_22()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_64()
+ {
+    if (jj_scan_token(OPEN_PARENTHESES)) return true;
+    if (jj_3R_14()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_43()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_64()) {
+    jj_scanpos = xsp;
+    if (jj_3R_65()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_73()
  {
-    if (jj_3R_35()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_36()) {
+    if (jj_scan_token(23)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(24)) return true;
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_90()) {
+    jj_scanpos = xsp;
+    if (jj_3R_91()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3_13()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_3R_37()) {
+    if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_3R_38()) {
+    if (jj_scan_token(72)) {
     jj_scanpos = xsp;
-    if (jj_3R_39()) return true;
+    if (jj_scan_token(73)) return true;
+    }
+    }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_17()) {
+    jj_scanpos = xsp;
+    if (jj_3R_18()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3_24()
+ {
+    if (jj_scan_token(NUMERIC)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_24()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_16()
+ {
+    if (jj_scan_token(ALPHANUMERIC)) return true;
+    if (jj_scan_token(OPEN_PARENTHESES)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_50()
+ {
+    if (jj_scan_token(INSERT)) return true;
+    if (jj_3R_72()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_73()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_114()
+ {
+    if (jj_scan_token(QUOTED_STRING)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_31()
+ {
+    if (jj_3R_43()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_79()
+ {
+    if (jj_scan_token(DESCRIBE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_24()) {
+    jj_scanpos = xsp;
+    if (jj_3R_94()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_14()
+ {
+    if (jj_3R_31()) return true;
+    return false;
+  }
+
+  private boolean jj_3_29()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(65)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) return true;
+    }
+    }
     }
     }
     }
     return false;
   }
 
+  private boolean jj_3R_38()
+ {
+    if (jj_3R_50()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_15()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
+    }
+    }
+    }
+    }
+    if (jj_scan_token(PIPE)) return true;
+    if (jj_scan_token(ALPHANUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_93()
+ {
+    if (jj_3R_23()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_71()
+ {
+    if (jj_scan_token(VERIFY_OR_SET)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(AS)) return true;
+    if (jj_3R_87()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_36()
+ {
+    if (jj_scan_token(AS_OF)) return true;
+    Token xsp;
+    if (jj_3_29()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_29()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3_23()
+ {
+    if (jj_3R_23()) return true;
+    return false;
+  }
+
+  private boolean jj_3_4()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(39)) jj_scanpos = xsp;
+    if (jj_3R_14()) return true;
+    return false;
+  }
+
   private boolean jj_3_12()
+ {
+    if (jj_3R_15()) return true;
+    return false;
+  }
+
+  private boolean jj_3_22()
+ {
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_3R_22()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_113()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
+    if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(40)) {
+    if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(41)) {
+    if (jj_scan_token(68)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(42)) return true;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
     }
     }
     }
-    if (jj_scan_token(COMMA)) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_72()
+ {
+    if (jj_scan_token(QUOTED_STRING)) return true;
+    return false;
+  }
+
+  private boolean jj_3_3()
+ {
+    if (jj_3R_13()) return true;
+    if (jj_scan_token(0)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_70()
+ {
+    if (jj_scan_token(VERIFY_AND_SWAP)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(AS)) return true;
+    if (jj_3R_87()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_108()
+ {
+    Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_19()) {
+    if (jj_3_10()) {
     jj_scanpos = xsp;
-    if (jj_3R_20()) return true;
+    if (jj_3R_113()) {
+    jj_scanpos = xsp;
+    if (jj_3R_114()) return true;
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_18()
+  private boolean jj_3_10()
+ {
+    if (jj_3R_16()) return true;
+    return false;
+  }
+
+  private boolean jj_3_21()
+ {
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_35()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3R_45()
+  private boolean jj_3R_78()
  {
+    if (jj_scan_token(GET)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(23)) {
+    if (jj_3_21()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(24)) {
+    if (jj_3_22()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(25)) {
+    if (jj_3_23()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(26)) return true;
+    if (jj_3R_93()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_17()
+  private boolean jj_3R_23()
  {
-    if (jj_scan_token(CLOSE_PARENTHESES)) return true;
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_21()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_35()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(CLOSE_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_13()
+  private boolean jj_3_2()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(39)) jj_scanpos = xsp;
+    if (jj_3R_14()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_89()
  {
     if (jj_3R_23()) return true;
     return false;
   }
 
-  private boolean jj_3R_43()
+  private boolean jj_3R_112()
  {
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_42()
+  private boolean jj_3_1()
  {
-    if (jj_scan_token(LINKS_TO)) return true;
+    if (jj_3R_13()) return true;
+    if (jj_scan_token(79)) return true;
     return false;
   }
 
-  private boolean jj_3R_12()
+  private boolean jj_3R_109()
  {
-    if (jj_3R_24()) return true;
+    if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3R_26()
+  private boolean jj_3_17()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_30()) {
-    jj_scanpos = xsp;
-    if (jj_3R_31()) return true;
-    }
+    if (jj_3R_23()) return true;
     return false;
   }
 
-  private boolean jj_3R_30()
+  private boolean jj_3R_92()
  {
-    if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    if (jj_3R_10()) return true;
+    if (jj_3R_23()) return true;
     return false;
   }
 
-  private boolean jj_3_11()
+  private boolean jj_3_8()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
+    if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(40)) {
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(41)) {
+    if (jj_scan_token(80)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(42)) return true;
+    if (jj_scan_token(81)) return true;
+    }
+    }
+    }
     }
     }
     }
-    xsp = jj_scanpos;
-    if (jj_3R_17()) {
-    jj_scanpos = xsp;
-    if (jj_3R_18()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_16()
- {
-    if (jj_scan_token(ALPHANUMERIC)) return true;
-    if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_57()
- {
-    if (jj_scan_token(QUOTED_STRING)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_59()
- {
-    if (jj_scan_token(QUOTED_STRING)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_21()
+  private boolean jj_3R_22()
  {
-    if (jj_3R_26()) return true;
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_27()) { jj_scanpos = xsp; break; }
+      if (jj_3R_109()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(CLOSE_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_11()
- {
-    if (jj_3R_23()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_23()
+  private boolean jj_3_16()
  {
-    if (jj_scan_token(ORDER)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
-  private boolean jj_3R_10()
+  private boolean jj_3_20()
  {
-    if (jj_3R_21()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_22()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_23()) return true;
     return false;
   }
 
-  private boolean jj_3R_15()
+  private boolean jj_3_9()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
+    if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(40)) {
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(37)) {
+    if (jj_scan_token(74)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(41)) {
+    if (jj_scan_token(73)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(42)) return true;
+    if (jj_scan_token(80)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(81)) return true;
+    }
+    }
+    }
     }
     }
     }
     }
-    if (jj_scan_token(PIPE)) return true;
-    if (jj_scan_token(ALPHANUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_47()
+  private boolean jj_3R_111()
  {
-    if (jj_3R_25()) return true;
+    Token xsp;
+    if (jj_3_9()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_9()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_50()
+  private boolean jj_3R_88()
  {
-    if (jj_3R_25()) return true;
+    if (jj_scan_token(AS)) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
-  private boolean jj_3R_44()
+  private boolean jj_3_15()
  {
-    if (jj_3R_25()) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_33()
+  private boolean jj_3_19()
  {
-    if (jj_scan_token(SIZE)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
-  private boolean jj_3R_31()
+  private boolean jj_3R_63()
  {
-    if (jj_3R_34()) return true;
+    if (jj_3R_23()) return true;
     return false;
   }
 
-  private boolean jj_3_4()
+  private boolean jj_3R_69()
  {
+    if (jj_scan_token(CLEAR)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(40)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(37)) {
+    if (jj_3_15()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(41)) {
+    if (jj_3_16()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(43)) {
+    if (jj_3_17()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(42)) return true;
-    }
-    }
+    if (jj_3R_89()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3_10()
+  private boolean jj_3_18()
  {
-    if (jj_3R_15()) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_56()
+  private boolean jj_3_28()
  {
-    Token xsp;
-    if (jj_3_4()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_4()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_23()) return true;
     return false;
   }
 
-  private boolean jj_3_2()
+  private boolean jj_3R_110()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(8)) jj_scanpos = xsp;
-    if (jj_3R_10()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_13()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_14()) jj_scanpos = xsp;
-    if (jj_scan_token(0)) return true;
+    if (jj_scan_token(OPEN_PARENTHESES)) return true;
     return false;
   }
 
-  private boolean jj_3R_58()
+  private boolean jj_3R_105()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(40)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(37)) {
+    if (jj_3R_110()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(41)) {
+    if (jj_3R_111()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(43)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(42)) return true;
-    }
-    }
-    }
+    if (jj_3R_112()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_49()
+  private boolean jj_3R_77()
  {
+    if (jj_scan_token(FETCH)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_5()) {
+    if (jj_3_18()) {
     jj_scanpos = xsp;
-    if (jj_3R_56()) {
+    if (jj_3_19()) {
     jj_scanpos = xsp;
-    if (jj_3R_57()) return true;
+    if (jj_3_20()) {
+    jj_scanpos = xsp;
+    if (jj_3R_92()) return true;
+    }
     }
     }
     return false;
   }
 
-  private boolean jj_3_5()
- {
-    if (jj_3R_16()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_32()
+  private boolean jj_3_27()
  {
-    if (jj_scan_token(PAGE)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(IN)) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
-  private boolean jj_3R_52()
+  private boolean jj_3R_68()
  {
+    if (jj_scan_token(REMOVE)) return true;
+    if (jj_3R_21()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_8()) {
-    jj_scanpos = xsp;
-    if (jj_3R_58()) {
+    if (jj_3R_88()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(25)) {
     jj_scanpos = xsp;
-    if (jj_3R_59()) return true;
-    }
+    if (jj_scan_token(23)) return true;
     }
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_8()
+  private boolean jj_3_26()
  {
-    if (jj_3R_16()) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(IN)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_29()
+  private boolean jj_3R_103()
  {
-    if (jj_3R_33()) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_1()
+  private boolean jj_3R_76()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(8)) jj_scanpos = xsp;
-    if (jj_3R_10()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_11()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_12()) jj_scanpos = xsp;
-    if (jj_scan_token(48)) return true;
+    if (jj_scan_token(SELECT)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_9()
+  private boolean jj_3R_42()
  {
+    if (jj_scan_token(REVERT)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(34)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(39)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(40)) {
+    if (jj_3_26()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(37)) {
+    if (jj_3_27()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(41)) {
+    if (jj_3_28()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(43)) return true;
-    }
-    }
+    if (jj_3R_63()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_28()
+  private boolean jj_3R_67()
  {
-    if (jj_3R_32()) return true;
+    if (jj_scan_token(SET)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(AS)) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
-  private boolean jj_3R_41()
+  private boolean jj_3R_101()
  {
-    if (jj_scan_token(PERIOD_SEPARATED_STRING)) return true;
+    if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_24()
+  private boolean jj_3R_59()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_28()) {
-    jj_scanpos = xsp;
-    if (jj_3R_29()) return true;
-    }
+    if (jj_3R_82()) return true;
     return false;
   }
 
-  private boolean jj_3R_55()
+  private boolean jj_3R_58()
  {
-    if (jj_scan_token(QUOTED_STRING)) return true;
+    if (jj_3R_81()) return true;
     return false;
   }
 
-  private boolean jj_3R_40()
+  private boolean jj_3R_57()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(9)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(39)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(40)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(37)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(41)) return true;
-    }
-    }
-    }
-    }
+    if (jj_3R_80()) return true;
     return false;
   }
 
-  private boolean jj_3_3()
+  private boolean jj_3R_85()
  {
-    if (jj_3R_15()) return true;
+    if (jj_scan_token(ABORT)) return true;
     return false;
   }
 
-  private boolean jj_3_6()
+  private boolean jj_3R_56()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(40)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(37)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(41)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(43)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(42)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(49)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(50)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_79()) return true;
     return false;
   }
 
-  private boolean jj_3R_25()
+  private boolean jj_3R_66()
  {
-    if (jj_scan_token(TIMESTAMP)) return true;
+    if (jj_scan_token(ADD)) return true;
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(AS)) return true;
+    if (jj_3R_87()) return true;
     return false;
   }
 
-  private boolean jj_3R_35()
+  private boolean jj_3R_55()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_3()) {
-    jj_scanpos = xsp;
-    if (jj_3R_40()) {
-    jj_scanpos = xsp;
-    if (jj_3R_41()) return true;
-    }
-    }
+    if (jj_3R_78()) return true;
     return false;
   }
 
-  private boolean jj_3_7()
+  private boolean jj_3R_54()
+ {
+    if (jj_3R_77()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_40()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(40)) {
+    if (jj_3R_53()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(37)) {
+    if (jj_3R_54()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(41)) {
+    if (jj_3R_55()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(43)) {
+    if (jj_3R_56()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(42)) {
+    if (jj_3R_57()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(49)) {
+    if (jj_3R_58()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(50)) return true;
-    }
+    if (jj_3R_59()) return true;
     }
     }
     }
@@ -2282,20 +4334,15 @@ private boolean jj_3_7()
     return false;
   }
 
-  private boolean jj_3R_54()
+  private boolean jj_3R_53()
  {
-    Token xsp;
-    if (jj_3_7()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_7()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_76()) return true;
     return false;
   }
 
-  private boolean jj_3R_51()
+  private boolean jj_3R_84()
  {
-    if (jj_scan_token(BINARY_OPERATOR)) return true;
+    if (jj_scan_token(COMMIT)) return true;
     return false;
   }
 
@@ -2310,20 +4357,25 @@ private boolean jj_3R_51()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[52];
+  final private int[] jj_la1 = new int[85];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
+  static private int[] jj_la1_2;
   static {
 	   jj_la1_init_0();
 	   jj_la1_init_1();
+	   jj_la1_init_2();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x100,0x40000000,0x30000000,0x70000000,0x100,0x40000000,0x30000000,0x70000000,0x800,0x400,0x208,0x80,0x80,0x80,0x80,0x7c0f000,0x200,0x200,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x7800000,0xd000,0x0,0x20000000,0x10000000,0x30000000,0x0,0x80000000,0xc200,0x80,0xc000,0x80000000,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x20,0x0,0x10,0x0,};
+	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x8000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x40000000,0x40000000,0x40000000,0x40000000,0x40000000,0x0,0x40000000,0x40000000,0x40000000,0x40000000,0x0,0x40000000,0x40000000,0x0,0x0,0x40000000,0x380000,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x0,0x0,0x0,0x7a0,0x0,0x0,0x0,0x7a0,0x0,0x0,0x7a0,0x0,0x0,0x0,0x0,0x0,0x3a0,0x7a0,0xfa0,0xfa4,0x60fa0,0x60fa0,0x60fa4,0xfa0,0xfa4,0x0,0x0,0xba4,0x0,0x0,0x0,0x40,0x1,0x7a0,0x0,0x0,0x1,0x200,0x7a0,0x780,0x40,0x780,0xa0,0x40,0xa0,0xa0,0x40,0xa0,0xa0,0x780,0x40,0x780,};
+	   jj_la1_1 = new int[] {0x80,0x20000000,0x18000000,0x38000000,0x80,0x20000000,0x18000000,0x38000000,0x400,0x200,0x104,0x40,0x40,0x40,0x40,0x3e07800,0x100,0x100,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x3c00000,0x6800,0x0,0x10000000,0x8000000,0x18000000,0x0,0xc0000000,0x6100,0x40,0x6000,0xc0000000,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x0,0x0,0x0,};
 	}
-  final private JJCalls[] jj_2_rtns = new JJCalls[12];
+	private static void jj_la1_init_2() {
+	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x3d0,0x0,0x0,0x0,0x3d0,0x0,0x0,0x3d0,0x0,0x0,0x0,0x0,0x0,0x1d0,0x3d0,0x7d0,0x7d2,0x307d0,0x307d0,0x307d2,0x7d0,0x7d2,0x0,0x0,0x5d2,0x0,0x0,0x0,0x20,0x0,0x3d0,0x0,0x0,0x0,0x100,0x3d0,0x3c0,0x20,0x3c0,0x50,0x20,0x50,0x50,0x20,0x50,0x50,0x3c0,0x20,0x3c0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x20,0x20,0x5d2,};
+	}
+  final private JJCalls[] jj_2_rtns = new JJCalls[29];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
@@ -2338,7 +4390,7 @@ public Grammar(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 52; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -2354,7 +4406,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 52; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -2365,7 +4417,7 @@ public Grammar(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 52; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -2385,7 +4437,7 @@ public void ReInit(java.io.Reader stream) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 52; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -2395,7 +4447,7 @@ public Grammar(GrammarTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 52; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -2406,7 +4458,7 @@ public void ReInit(GrammarTokenManager tm) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 52; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -2532,12 +4584,12 @@ private void jj_add_error_token(int kind, int pos) {
   /** Generate ParseException. */
   public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[51];
+	 boolean[] la1tokens = new boolean[82];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 52; i++) {
+	 for (int i = 0; i < 85; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -2546,10 +4598,13 @@ public ParseException generateParseException() {
 		   if ((jj_la1_1[i] & (1<<j)) != 0) {
 			 la1tokens[32+j] = true;
 		   }
+		   if ((jj_la1_2[i] & (1<<j)) != 0) {
+			 la1tokens[64+j] = true;
+		   }
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 51; i++) {
+	 for (int i = 0; i < 82; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
@@ -2584,7 +4639,7 @@ final public void disable_tracing() {
 
   private void jj_rescan_token() {
 	 jj_rescan = true;
-	 for (int i = 0; i < 12; i++) {
+	 for (int i = 0; i < 29; i++) {
 	   try {
 		 JJCalls p = jj_2_rtns[i];
 
@@ -2604,6 +4659,23 @@ private void jj_rescan_token() {
 			   case 9: jj_3_10(); break;
 			   case 10: jj_3_11(); break;
 			   case 11: jj_3_12(); break;
+			   case 12: jj_3_13(); break;
+			   case 13: jj_3_14(); break;
+			   case 14: jj_3_15(); break;
+			   case 15: jj_3_16(); break;
+			   case 16: jj_3_17(); break;
+			   case 17: jj_3_18(); break;
+			   case 18: jj_3_19(); break;
+			   case 19: jj_3_20(); break;
+			   case 20: jj_3_21(); break;
+			   case 21: jj_3_22(); break;
+			   case 22: jj_3_23(); break;
+			   case 23: jj_3_24(); break;
+			   case 24: jj_3_25(); break;
+			   case 25: jj_3_26(); break;
+			   case 26: jj_3_27(); break;
+			   case 27: jj_3_28(); break;
+			   case 28: jj_3_29(); break;
 			 }
 		   }
 		   p = p.next;
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
index d25cc7a1..50ca3c61 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
@@ -11,95 +11,157 @@ public interface GrammarConstants {
   /** End of File. */
   int EOF = 0;
   /** RegularExpression Id. */
-  int OPEN_PARENTHESES = 3;
+  int ADD = 3;
   /** RegularExpression Id. */
-  int CLOSE_PARENTHESES = 4;
+  int SET = 4;
   /** RegularExpression Id. */
-  int OPEN_BRACKET = 5;
+  int REMOVE = 5;
   /** RegularExpression Id. */
-  int CLOSE_BRACKET = 6;
+  int CLEAR = 6;
   /** RegularExpression Id. */
-  int TIMESTAMP = 7;
+  int VERIFY_AND_SWAP = 7;
   /** RegularExpression Id. */
-  int WHERE = 8;
+  int VERIFY_OR_SET = 8;
   /** RegularExpression Id. */
-  int RESERVED_IDENTIFIER = 9;
+  int INSERT = 9;
   /** RegularExpression Id. */
-  int CONJUNCTION = 10;
+  int LINK = 10;
   /** RegularExpression Id. */
-  int DISJUNCTION = 11;
+  int UNLINK = 11;
   /** RegularExpression Id. */
-  int UNARY_OPERATOR = 12;
+  int SELECT = 12;
   /** RegularExpression Id. */
-  int BINARY_OPERATOR = 13;
+  int FETCH = 13;
   /** RegularExpression Id. */
-  int OPEN_ANGLE_BRACKET = 14;
+  int GET = 14;
   /** RegularExpression Id. */
-  int CLOSE_ANGLE_BRACKET = 15;
+  int DESCRIBE = 15;
   /** RegularExpression Id. */
-  int EQUALS = 16;
+  int AUDIT = 16;
   /** RegularExpression Id. */
-  int NOT_EQUALS = 17;
+  int VERIFY = 17;
   /** RegularExpression Id. */
-  int GREATER_THAN = 18;
+  int SEARCH = 18;
   /** RegularExpression Id. */
-  int GREATER_THAN_OR_EQUALS = 19;
+  int STAGE = 19;
   /** RegularExpression Id. */
-  int LESS_THAN = 20;
+  int COMMIT = 20;
   /** RegularExpression Id. */
-  int LESS_THAN_OR_EQUALS = 21;
+  int ABORT = 21;
   /** RegularExpression Id. */
-  int LINKS_TO = 22;
+  int REVERT = 22;
   /** RegularExpression Id. */
-  int REGEX = 23;
+  int IN = 23;
   /** RegularExpression Id. */
-  int NOT_REGEX = 24;
+  int INTO = 24;
   /** RegularExpression Id. */
-  int LIKE = 25;
+  int FROM = 25;
   /** RegularExpression Id. */
-  int NOT_LIKE = 26;
+  int TO = 26;
   /** RegularExpression Id. */
-  int BETWEEN = 27;
+  int AS = 27;
   /** RegularExpression Id. */
-  int PAGE = 28;
+  int FOR = 28;
   /** RegularExpression Id. */
-  int SIZE = 29;
+  int WITH = 29;
   /** RegularExpression Id. */
-  int ORDER = 30;
+  int AS_OF = 30;
   /** RegularExpression Id. */
-  int ASC = 31;
+  int OPEN_BRACE = 31;
   /** RegularExpression Id. */
-  int DESC = 32;
+  int CLOSE_BRACE = 32;
   /** RegularExpression Id. */
-  int PIPE = 33;
+  int COLON = 33;
   /** RegularExpression Id. */
-  int QUOTED_STRING = 34;
+  int OPEN_PARENTHESES = 34;
   /** RegularExpression Id. */
-  int DOUBLE_QUOTED_STRING = 35;
+  int CLOSE_PARENTHESES = 35;
   /** RegularExpression Id. */
-  int SINGLE_QUOTED_STRING = 36;
+  int OPEN_BRACKET = 36;
   /** RegularExpression Id. */
-  int NUMERIC = 37;
+  int CLOSE_BRACKET = 37;
   /** RegularExpression Id. */
-  int COMMA = 38;
+  int TIMESTAMP = 38;
   /** RegularExpression Id. */
-  int SIGNED_INTEGER = 39;
+  int WHERE = 39;
   /** RegularExpression Id. */
-  int SIGNED_DECIMAL = 40;
+  int RESERVED_IDENTIFIER = 40;
   /** RegularExpression Id. */
-  int ALPHANUMERIC = 41;
+  int CONJUNCTION = 41;
   /** RegularExpression Id. */
-  int PERIOD_SEPARATED_STRING = 42;
+  int DISJUNCTION = 42;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 43;
+  int UNARY_OPERATOR = 43;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC = 44;
+  int BINARY_OPERATOR = 44;
   /** RegularExpression Id. */
-  int LETTER = 45;
+  int OPEN_ANGLE_BRACKET = 45;
   /** RegularExpression Id. */
-  int DIGIT = 46;
+  int CLOSE_ANGLE_BRACKET = 46;
   /** RegularExpression Id. */
-  int PERIOD = 47;
+  int EQUALS = 47;
+  /** RegularExpression Id. */
+  int NOT_EQUALS = 48;
+  /** RegularExpression Id. */
+  int GREATER_THAN = 49;
+  /** RegularExpression Id. */
+  int GREATER_THAN_OR_EQUALS = 50;
+  /** RegularExpression Id. */
+  int LESS_THAN = 51;
+  /** RegularExpression Id. */
+  int LESS_THAN_OR_EQUALS = 52;
+  /** RegularExpression Id. */
+  int LINKS_TO = 53;
+  /** RegularExpression Id. */
+  int REGEX = 54;
+  /** RegularExpression Id. */
+  int NOT_REGEX = 55;
+  /** RegularExpression Id. */
+  int LIKE = 56;
+  /** RegularExpression Id. */
+  int NOT_LIKE = 57;
+  /** RegularExpression Id. */
+  int BETWEEN = 58;
+  /** RegularExpression Id. */
+  int PAGE = 59;
+  /** RegularExpression Id. */
+  int SIZE = 60;
+  /** RegularExpression Id. */
+  int ORDER = 61;
+  /** RegularExpression Id. */
+  int ASC = 62;
+  /** RegularExpression Id. */
+  int DESC = 63;
+  /** RegularExpression Id. */
+  int PIPE = 64;
+  /** RegularExpression Id. */
+  int QUOTED_STRING = 65;
+  /** RegularExpression Id. */
+  int DOUBLE_QUOTED_STRING = 66;
+  /** RegularExpression Id. */
+  int SINGLE_QUOTED_STRING = 67;
+  /** RegularExpression Id. */
+  int NUMERIC = 68;
+  /** RegularExpression Id. */
+  int COMMA = 69;
+  /** RegularExpression Id. */
+  int SIGNED_INTEGER = 70;
+  /** RegularExpression Id. */
+  int SIGNED_DECIMAL = 71;
+  /** RegularExpression Id. */
+  int ALPHANUMERIC = 72;
+  /** RegularExpression Id. */
+  int PERIOD_SEPARATED_STRING = 73;
+  /** RegularExpression Id. */
+  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 74;
+  /** RegularExpression Id. */
+  int NON_ALPHANUMERIC = 75;
+  /** RegularExpression Id. */
+  int LETTER = 76;
+  /** RegularExpression Id. */
+  int DIGIT = 77;
+  /** RegularExpression Id. */
+  int PERIOD = 78;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -109,6 +171,37 @@ public interface GrammarConstants {
     "<EOF>",
     "\" \"",
     "\"\\t\"",
+    "\"add\"",
+    "\"set\"",
+    "\"remove\"",
+    "\"clear\"",
+    "<VERIFY_AND_SWAP>",
+    "<VERIFY_OR_SET>",
+    "\"insert\"",
+    "\"link\"",
+    "\"unlink\"",
+    "\"select\"",
+    "\"fetch\"",
+    "\"get\"",
+    "\"describe\"",
+    "\"audit\"",
+    "\"verify\"",
+    "\"search\"",
+    "\"stage\"",
+    "\"commit\"",
+    "\"abort\"",
+    "\"revert\"",
+    "\"in\"",
+    "\"into\"",
+    "\"from\"",
+    "\"to\"",
+    "\"as\"",
+    "\"for\"",
+    "\"with\"",
+    "\"as of\"",
+    "\"{\"",
+    "\"}\"",
+    "\":\"",
     "\"(\"",
     "\")\"",
     "\"[\"",
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarDefaultVisitor.java b/src/main/java/com/cinchapi/ccl/generated/GrammarDefaultVisitor.java
index 6045df9d..f51f7750 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarDefaultVisitor.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarDefaultVisitor.java
@@ -30,5 +30,8 @@ public Object visit(ASTOrder node, Object data){
   public Object visit(ASTFunction node, Object data){
     return defaultVisit(node, data);
   }
+  public Object visit(ASTCommand node, Object data){
+    return defaultVisit(node, data);
+  }
 }
-/* JavaCC - OriginalChecksum=2ca7aae34aa01ca7a28abe7f4102cced (do not edit this line) */
+/* JavaCC - OriginalChecksum=afedcdee16e1f282f4ee141924e100ff (do not edit this line) */
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
index 2fa03b88..a437c6ff 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
@@ -3,25 +3,25 @@
 package com.cinchapi.ccl.generated;
 import com.cinchapi.ccl.SyntaxException;
 import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
 import com.cinchapi.ccl.type.function.KeyRecordsFunction;
-import com.cinchapi.ccl.grammar.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
 import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
 import com.cinchapi.ccl.type.function.IndexFunction;
 import com.cinchapi.ccl.grammar.NavigationKeySymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.PageSymbol;
-import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.condition.PageSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderSymbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.util.NaturalLanguage;
 import com.cinchapi.common.base.AnyStrings;
@@ -33,7 +33,6 @@
 import java.util.function.Function;
 
 /** Token Manager. */
-@SuppressWarnings("unused")
 public class GrammarTokenManager implements GrammarConstants {
 
   /** Debug output. */
@@ -53,74 +52,111 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 2;
          return jjMoveNfa_0(5, 0);
       case 10:
-         jjmatchedKind = 48;
+         jjmatchedKind = 79;
          return jjMoveNfa_0(5, 0);
       case 32:
          jjmatchedKind = 1;
          return jjMoveNfa_0(5, 0);
       case 36:
-         return jjMoveStringLiteralDfa1_0(0x200L);
+         return jjMoveStringLiteralDfa1_0(0x10000000000L);
       case 40:
-         jjmatchedKind = 3;
+         jjmatchedKind = 34;
          return jjMoveNfa_0(5, 0);
       case 41:
-         jjmatchedKind = 4;
+         jjmatchedKind = 35;
          return jjMoveNfa_0(5, 0);
       case 44:
-         jjmatchedKind = 38;
+         jjmatchedKind = 69;
+         return jjMoveNfa_0(5, 0);
+      case 58:
+         jjmatchedKind = 33;
          return jjMoveNfa_0(5, 0);
       case 60:
-         jjmatchedKind = 14;
+         jjmatchedKind = 45;
          return jjMoveNfa_0(5, 0);
       case 61:
-         jjmatchedKind = 50;
+         jjmatchedKind = 81;
          return jjMoveNfa_0(5, 0);
       case 62:
-         jjmatchedKind = 15;
+         jjmatchedKind = 46;
          return jjMoveNfa_0(5, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x80000000L);
+         return jjMoveStringLiteralDfa1_0(0x4000000048210008L);
+      case 67:
+         return jjMoveStringLiteralDfa1_0(0x100040L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x100000000L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000008000L);
+      case 70:
+         return jjMoveStringLiteralDfa1_0(0x12002000L);
+      case 71:
+         return jjMoveStringLiteralDfa1_0(0x4000L);
+      case 73:
+         return jjMoveStringLiteralDfa1_0(0x1800200L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x2000000L);
+         return jjMoveStringLiteralDfa1_0(0x100000000000400L);
       case 79:
-         return jjMoveStringLiteralDfa1_0(0x40000000L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000000L);
       case 80:
-         return jjMoveStringLiteralDfa1_0(0x10000000L);
+         return jjMoveStringLiteralDfa1_0(0x800000000000000L);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x800000L);
+         return jjMoveStringLiteralDfa1_0(0x40000000400020L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0x20000000L);
+         return jjMoveStringLiteralDfa1_0(0x10000000000c1010L);
+      case 84:
+         return jjMoveStringLiteralDfa1_0(0x4000000L);
+      case 85:
+         return jjMoveStringLiteralDfa1_0(0x800L);
+      case 86:
+         return jjMoveStringLiteralDfa1_0(0x20000L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x100L);
+         return jjMoveStringLiteralDfa1_0(0x8020000000L);
       case 91:
-         jjmatchedKind = 5;
+         jjmatchedKind = 36;
          return jjMoveNfa_0(5, 0);
       case 93:
-         jjmatchedKind = 6;
+         jjmatchedKind = 37;
          return jjMoveNfa_0(5, 0);
       case 95:
-         jjmatchedKind = 49;
+         jjmatchedKind = 80;
          return jjMoveNfa_0(5, 0);
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x80000000L);
+         return jjMoveStringLiteralDfa1_0(0x4000000048210008L);
+      case 99:
+         return jjMoveStringLiteralDfa1_0(0x100040L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x100000000L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000008000L);
+      case 102:
+         return jjMoveStringLiteralDfa1_0(0x12002000L);
+      case 103:
+         return jjMoveStringLiteralDfa1_0(0x4000L);
+      case 105:
+         return jjMoveStringLiteralDfa1_0(0x1800200L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x2000000L);
+         return jjMoveStringLiteralDfa1_0(0x100000000000400L);
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x40000000L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000000L);
       case 112:
-         return jjMoveStringLiteralDfa1_0(0x10000000L);
+         return jjMoveStringLiteralDfa1_0(0x800000000000000L);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x800000L);
+         return jjMoveStringLiteralDfa1_0(0x40000000400020L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x20000000L);
+         return jjMoveStringLiteralDfa1_0(0x10000000000c1010L);
+      case 116:
+         return jjMoveStringLiteralDfa1_0(0x4000000L);
+      case 117:
+         return jjMoveStringLiteralDfa1_0(0x800L);
+      case 118:
+         return jjMoveStringLiteralDfa1_0(0x20000L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x100L);
+         return jjMoveStringLiteralDfa1_0(0x8020000000L);
+      case 123:
+         jjmatchedKind = 31;
+         return jjMoveNfa_0(5, 0);
       case 124:
-         jjmatchedKind = 33;
+         jjmatchedKind = 64;
+         return jjMoveNfa_0(5, 0);
+      case 125:
+         jjmatchedKind = 32;
          return jjMoveNfa_0(5, 0);
       default :
          return jjMoveNfa_0(5, 0);
@@ -134,29 +170,87 @@ private int jjMoveStringLiteralDfa1_0(long active0){
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
+      case 66:
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000L);
+      case 68:
+         return jjMoveStringLiteralDfa2_0(active0, 0x8L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x100800000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x804000000046f030L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x22000200L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1100010020000400L);
+      case 76:
+         return jjMoveStringLiteralDfa2_0(active0, 0x40L);
+      case 78:
+         if ((active0 & 0x800000L) != 0L)
+         {
+            jjmatchedKind = 23;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000a00L);
+      case 79:
+         if ((active0 & 0x4000000L) != 0L)
+         {
+            jjmatchedKind = 26;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0x10100000L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000002000000L);
       case 83:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000000L);
+         if ((active0 & 0x8000000L) != 0L)
+         {
+            jjmatchedKind = 27;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000040000000L);
+      case 84:
+         return jjMoveStringLiteralDfa2_0(active0, 0x80000L);
+      case 85:
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
+      case 98:
+         return jjMoveStringLiteralDfa2_0(active0, 0x200000L);
+      case 100:
+         return jjMoveStringLiteralDfa2_0(active0, 0x8L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x100800000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x804000000046f030L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x22000200L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1100010020000400L);
+      case 108:
+         return jjMoveStringLiteralDfa2_0(active0, 0x40L);
+      case 110:
+         if ((active0 & 0x800000L) != 0L)
+         {
+            jjmatchedKind = 23;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000a00L);
+      case 111:
+         if ((active0 & 0x4000000L) != 0L)
+         {
+            jjmatchedKind = 26;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0x10100000L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000002000000L);
       case 115:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000000L);
+         if ((active0 & 0x8000000L) != 0L)
+         {
+            jjmatchedKind = 27;
+            jjmatchedPos = 1;
+         }
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000040000000L);
+      case 116:
+         return jjMoveStringLiteralDfa2_0(active0, 0x80000L);
+      case 117:
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
       default :
          break;
    }
@@ -171,44 +265,118 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0){
    }
    switch(curChar)
    {
+      case 32:
+         return jjMoveStringLiteralDfa3_0(active0, 0x40000000L);
+      case 65:
+         return jjMoveStringLiteralDfa3_0(active0, 0xc0000L);
       case 67:
-         if ((active0 & 0x80000000L) != 0L)
+         if ((active0 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 31;
+            jjmatchedKind = 62;
             jjmatchedPos = 2;
          }
          break;
       case 68:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000200L);
+         if ((active0 & 0x8L) != 0L)
+         {
+            jjmatchedKind = 3;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000010000010000L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000040L);
       case 71:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10800000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000000L);
       case 75:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L);
+      case 76:
+         return jjMoveStringLiteralDfa3_0(active0, 0x1800L);
+      case 77:
+         return jjMoveStringLiteralDfa3_0(active0, 0x100020L);
+      case 78:
+         return jjMoveStringLiteralDfa3_0(active0, 0x400L);
+      case 79:
+         return jjMoveStringLiteralDfa3_0(active0, 0x2200000L);
+      case 82:
+         if ((active0 & 0x10000000L) != 0L)
+         {
+            jjmatchedKind = 28;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
       case 83:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000008200L);
+      case 84:
+         if ((active0 & 0x10L) != 0L)
+         {
+            jjmatchedKind = 4;
+            jjmatchedPos = 2;
+         }
+         else if ((active0 & 0x4000L) != 0L)
+         {
+            jjmatchedKind = 14;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0x21002000L);
+      case 86:
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
       case 90:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L);
+      case 97:
+         return jjMoveStringLiteralDfa3_0(active0, 0xc0000L);
       case 99:
-         if ((active0 & 0x80000000L) != 0L)
+         if ((active0 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 31;
+            jjmatchedKind = 62;
             jjmatchedPos = 2;
          }
          break;
       case 100:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000200L);
+         if ((active0 & 0x8L) != 0L)
+         {
+            jjmatchedKind = 3;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000010000010000L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000040L);
       case 103:
-         return jjMoveStringLiteralDfa3_0(active0, 0x10800000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000000L);
       case 107:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L);
+      case 108:
+         return jjMoveStringLiteralDfa3_0(active0, 0x1800L);
+      case 109:
+         return jjMoveStringLiteralDfa3_0(active0, 0x100020L);
+      case 110:
+         return jjMoveStringLiteralDfa3_0(active0, 0x400L);
+      case 111:
+         return jjMoveStringLiteralDfa3_0(active0, 0x2200000L);
+      case 114:
+         if ((active0 & 0x10000000L) != 0L)
+         {
+            jjmatchedKind = 28;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
       case 115:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000008200L);
+      case 116:
+         if ((active0 & 0x10L) != 0L)
+         {
+            jjmatchedKind = 4;
+            jjmatchedPos = 2;
+         }
+         else if ((active0 & 0x4000L) != 0L)
+         {
+            jjmatchedKind = 14;
+            jjmatchedPos = 2;
+         }
+         return jjMoveStringLiteralDfa3_0(active0, 0x21002000L);
+      case 118:
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
       case 122:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L);
       default :
          break;
    }
@@ -224,64 +392,132 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0){
    switch(curChar)
    {
       case 36:
-         if ((active0 & 0x200L) != 0L)
+         if ((active0 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 9;
+            jjmatchedKind = 40;
             jjmatchedPos = 3;
          }
          break;
+      case 65:
+         return jjMoveStringLiteralDfa4_0(active0, 0x40L);
       case 67:
-         if ((active0 & 0x100000000L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 63;
             jjmatchedPos = 3;
          }
-         break;
+         return jjMoveStringLiteralDfa4_0(active0, 0xa000L);
       case 69:
-         if ((active0 & 0x2000000L) != 0L)
+         if ((active0 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 25;
+            jjmatchedKind = 56;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x10000000L) != 0L)
+         else if ((active0 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 59;
+            jjmatchedPos = 3;
+         }
+         else if ((active0 & 0x1000000000000000L) != 0L)
+         {
+            jjmatchedKind = 60;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x20000000L) != 0L)
+         return jjMoveStringLiteralDfa4_0(active0, 0x2040000000401200L);
+      case 71:
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
+      case 72:
+         if ((active0 & 0x20000000L) != 0L)
          {
             jjmatchedKind = 29;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x40800000L);
-      case 82:
-         return jjMoveStringLiteralDfa4_0(active0, 0x100L);
-      case 99:
-         if ((active0 & 0x100000000L) != 0L)
+         break;
+      case 73:
+         return jjMoveStringLiteralDfa4_0(active0, 0x30800L);
+      case 75:
+         if ((active0 & 0x400L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 10;
             jjmatchedPos = 3;
          }
          break;
-      case 101:
+      case 77:
          if ((active0 & 0x2000000L) != 0L)
          {
             jjmatchedKind = 25;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x10000000L) != 0L)
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000L);
+      case 79:
+         if ((active0 & 0x1000000L) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 24;
+            jjmatchedPos = 3;
+         }
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000020L);
+      case 82:
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000240000L);
+      case 97:
+         return jjMoveStringLiteralDfa4_0(active0, 0x40L);
+      case 99:
+         if ((active0 & 0x8000000000000000L) != 0L)
+         {
+            jjmatchedKind = 63;
+            jjmatchedPos = 3;
+         }
+         return jjMoveStringLiteralDfa4_0(active0, 0xa000L);
+      case 101:
+         if ((active0 & 0x100000000000000L) != 0L)
+         {
+            jjmatchedKind = 56;
+            jjmatchedPos = 3;
+         }
+         else if ((active0 & 0x800000000000000L) != 0L)
+         {
+            jjmatchedKind = 59;
+            jjmatchedPos = 3;
+         }
+         else if ((active0 & 0x1000000000000000L) != 0L)
+         {
+            jjmatchedKind = 60;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x20000000L) != 0L)
+         return jjMoveStringLiteralDfa4_0(active0, 0x2040000000401200L);
+      case 103:
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
+      case 104:
+         if ((active0 & 0x20000000L) != 0L)
          {
             jjmatchedKind = 29;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x40800000L);
+         break;
+      case 105:
+         return jjMoveStringLiteralDfa4_0(active0, 0x30800L);
+      case 107:
+         if ((active0 & 0x400L) != 0L)
+         {
+            jjmatchedKind = 10;
+            jjmatchedPos = 3;
+         }
+         break;
+      case 109:
+         if ((active0 & 0x2000000L) != 0L)
+         {
+            jjmatchedKind = 25;
+            jjmatchedPos = 3;
+         }
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000L);
+      case 111:
+         if ((active0 & 0x1000000L) != 0L)
+         {
+            jjmatchedKind = 24;
+            jjmatchedPos = 3;
+         }
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000020L);
       case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0x100L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000240000L);
       default :
          break;
    }
@@ -296,35 +532,123 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0){
    }
    switch(curChar)
    {
+      case 67:
+         return jjMoveStringLiteralDfa5_0(active0, 0x41000L);
       case 69:
-         if ((active0 & 0x100L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
+         {
+            jjmatchedKind = 19;
+            jjmatchedPos = 4;
+         }
+         else if ((active0 & 0x8000000000L) != 0L)
+         {
+            jjmatchedKind = 39;
+            jjmatchedPos = 4;
+         }
+         break;
+      case 70:
+         if ((active0 & 0x40000000L) != 0L)
+         {
+            jjmatchedKind = 30;
+            jjmatchedPos = 4;
+         }
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000L);
+      case 72:
+         if ((active0 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 8;
+            jjmatchedKind = 13;
             jjmatchedPos = 4;
          }
          break;
+      case 73:
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000L);
+      case 78:
+         return jjMoveStringLiteralDfa5_0(active0, 0x800L);
       case 82:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000000L);
+         if ((active0 & 0x40L) != 0L)
+         {
+            jjmatchedKind = 6;
+            jjmatchedPos = 4;
+         }
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000408200L);
+      case 84:
+         if ((active0 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 16;
+            jjmatchedPos = 4;
+         }
+         else if ((active0 & 0x200000L) != 0L)
+         {
+            jjmatchedKind = 21;
+            jjmatchedPos = 4;
+         }
+         break;
+      case 86:
+         return jjMoveStringLiteralDfa5_0(active0, 0x20L);
       case 88:
-         if ((active0 & 0x800000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 23;
+            jjmatchedKind = 54;
             jjmatchedPos = 4;
          }
          break;
+      case 99:
+         return jjMoveStringLiteralDfa5_0(active0, 0x41000L);
       case 101:
-         if ((active0 & 0x100L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
+         {
+            jjmatchedKind = 19;
+            jjmatchedPos = 4;
+         }
+         else if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 8;
+            jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
          break;
+      case 102:
+         if ((active0 & 0x40000000L) != 0L)
+         {
+            jjmatchedKind = 30;
+            jjmatchedPos = 4;
+         }
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000L);
+      case 104:
+         if ((active0 & 0x2000L) != 0L)
+         {
+            jjmatchedKind = 13;
+            jjmatchedPos = 4;
+         }
+         break;
+      case 105:
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000L);
+      case 110:
+         return jjMoveStringLiteralDfa5_0(active0, 0x800L);
       case 114:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000000L);
+         if ((active0 & 0x40L) != 0L)
+         {
+            jjmatchedKind = 6;
+            jjmatchedPos = 4;
+         }
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000408200L);
+      case 116:
+         if ((active0 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 16;
+            jjmatchedPos = 4;
+         }
+         else if ((active0 & 0x200000L) != 0L)
+         {
+            jjmatchedKind = 21;
+            jjmatchedPos = 4;
+         }
+         break;
+      case 118:
+         return jjMoveStringLiteralDfa5_0(active0, 0x20L);
       case 120:
-         if ((active0 & 0x800000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 23;
+            jjmatchedKind = 54;
             jjmatchedPos = 4;
          }
          break;
@@ -343,7 +667,111 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0){
    switch(curChar)
    {
       case 32:
-         return jjMoveStringLiteralDfa6_0(active0, 0x40000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L);
+      case 69:
+         if ((active0 & 0x20L) != 0L)
+         {
+            jjmatchedKind = 5;
+            jjmatchedPos = 5;
+         }
+         break;
+      case 72:
+         if ((active0 & 0x40000L) != 0L)
+         {
+            jjmatchedKind = 18;
+            jjmatchedPos = 5;
+         }
+         break;
+      case 73:
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000L);
+      case 75:
+         if ((active0 & 0x800L) != 0L)
+         {
+            jjmatchedKind = 11;
+            jjmatchedPos = 5;
+         }
+         break;
+      case 84:
+         if ((active0 & 0x200L) != 0L)
+         {
+            jjmatchedKind = 9;
+            jjmatchedPos = 5;
+         }
+         else if ((active0 & 0x1000L) != 0L)
+         {
+            jjmatchedKind = 12;
+            jjmatchedPos = 5;
+         }
+         else if ((active0 & 0x100000L) != 0L)
+         {
+            jjmatchedKind = 20;
+            jjmatchedPos = 5;
+         }
+         else if ((active0 & 0x400000L) != 0L)
+         {
+            jjmatchedKind = 22;
+            jjmatchedPos = 5;
+         }
+         break;
+      case 89:
+         if ((active0 & 0x20000L) != 0L)
+         {
+            jjmatchedKind = 17;
+            jjmatchedPos = 5;
+         }
+         break;
+      case 101:
+         if ((active0 & 0x20L) != 0L)
+         {
+            jjmatchedKind = 5;
+            jjmatchedPos = 5;
+         }
+         break;
+      case 104:
+         if ((active0 & 0x40000L) != 0L)
+         {
+            jjmatchedKind = 18;
+            jjmatchedPos = 5;
+         }
+         break;
+      case 105:
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000L);
+      case 107:
+         if ((active0 & 0x800L) != 0L)
+         {
+            jjmatchedKind = 11;
+            jjmatchedPos = 5;
+         }
+         break;
+      case 116:
+         if ((active0 & 0x200L) != 0L)
+         {
+            jjmatchedKind = 9;
+            jjmatchedPos = 5;
+         }
+         else if ((active0 & 0x1000L) != 0L)
+         {
+            jjmatchedKind = 12;
+            jjmatchedPos = 5;
+         }
+         else if ((active0 & 0x100000L) != 0L)
+         {
+            jjmatchedKind = 20;
+            jjmatchedPos = 5;
+         }
+         else if ((active0 & 0x400000L) != 0L)
+         {
+            jjmatchedKind = 22;
+            jjmatchedPos = 5;
+         }
+         break;
+      case 121:
+         if ((active0 & 0x20000L) != 0L)
+         {
+            jjmatchedKind = 17;
+            jjmatchedPos = 5;
+         }
+         break;
       default :
          break;
    }
@@ -359,9 +787,9 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0){
    switch(curChar)
    {
       case 66:
-         return jjMoveStringLiteralDfa7_0(active0, 0x40000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000008000L);
       case 98:
-         return jjMoveStringLiteralDfa7_0(active0, 0x40000000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000008000L);
       default :
          break;
    }
@@ -376,17 +804,31 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0){
    }
    switch(curChar)
    {
+      case 69:
+         if ((active0 & 0x8000L) != 0L)
+         {
+            jjmatchedKind = 15;
+            jjmatchedPos = 7;
+         }
+         break;
       case 89:
-         if ((active0 & 0x40000000L) != 0L)
+         if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 61;
+            jjmatchedPos = 7;
+         }
+         break;
+      case 101:
+         if ((active0 & 0x8000L) != 0L)
+         {
+            jjmatchedKind = 15;
             jjmatchedPos = 7;
          }
          break;
       case 121:
-         if ((active0 & 0x40000000L) != 0L)
+         if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 61;
             jjmatchedPos = 7;
          }
          break;
@@ -432,7 +874,7 @@ private int jjMoveNfa_0(int startState, int curPos)
    catch(java.io.IOException e) { throw new Error("Internal Error"); }
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 214;
+   jjnewStateCnt = 261;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -450,19 +892,19 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 5:
                   if ((0xdfffecfeffffd9ffL & l) != 0L)
                   {
-                     if (kind > 43)
-                        kind = 43;
+                     if (kind > 74)
+                        kind = 74;
                      { jjCheckNAddTwoStates(20, 21); }
                   }
                   else if (curChar == 61)
                   {
-                     if (kind > 12)
-                        kind = 12;
+                     if (kind > 43)
+                        kind = 43;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 41)
-                        kind = 41;
+                     if (kind > 72)
+                        kind = 72;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0x280000000000L & l) != 0L)
@@ -481,13 +923,13 @@ else if (curChar == 61)
                      { jjCheckNAdd(13); }
                   else if (curChar == 38)
                   {
-                     if (kind > 10)
-                        kind = 10;
+                     if (kind > 41)
+                        kind = 41;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 37)
-                        kind = 37;
+                     if (kind > 68)
+                        kind = 68;
                      { jjCheckNAddStates(16, 21); }
                   }
                   else if (curChar == 45)
@@ -496,28 +938,28 @@ else if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 8;
                   break;
                case 8:
-                  if (curChar == 38 && kind > 10)
-                     kind = 10;
+                  if (curChar == 38 && kind > 41)
+                     kind = 41;
                   break;
                case 9:
                   if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 8;
                   break;
                case 10:
-                  if (curChar == 38 && kind > 10)
-                     kind = 10;
+                  if (curChar == 38 && kind > 41)
+                     kind = 41;
                   break;
                case 13:
-                  if (curChar == 61 && kind > 12)
-                     kind = 12;
+                  if (curChar == 61 && kind > 43)
+                     kind = 43;
                   break;
                case 14:
                   if (curChar == 61)
                      { jjCheckNAdd(13); }
                   break;
                case 15:
-                  if (curChar == 61 && kind > 12)
-                     kind = 12;
+                  if (curChar == 61 && kind > 43)
+                     kind = 43;
                   break;
                case 16:
                   if (curChar == 33)
@@ -528,8 +970,8 @@ else if (curChar == 38)
                      { jjCheckNAdd(13); }
                   break;
                case 18:
-                  if (curChar == 62 && kind > 22)
-                     kind = 22;
+                  if (curChar == 62 && kind > 53)
+                     kind = 53;
                   break;
                case 19:
                   if (curChar == 45)
@@ -538,15 +980,15 @@ else if (curChar == 38)
                case 20:
                   if ((0xdfffecfeffffd9ffL & l) == 0L)
                      break;
-                  if (kind > 43)
-                     kind = 43;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 21:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 43)
-                     kind = 43;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 78:
@@ -554,8 +996,8 @@ else if (curChar == 38)
                      { jjCheckNAddTwoStates(13, 79); }
                   break;
                case 79:
-                  if (curChar == 60 && kind > 13)
-                     kind = 13;
+                  if (curChar == 60 && kind > 44)
+                     kind = 44;
                   break;
                case 82:
                case 83:
@@ -577,8 +1019,8 @@ else if (curChar == 38)
                      { jjCheckNAddStates(28, 30); }
                   break;
                case 93:
-                  if (curChar == 34 && kind > 34)
-                     kind = 34;
+                  if (curChar == 34 && kind > 65)
+                     kind = 65;
                   break;
                case 95:
                   { jjCheckNAddStates(31, 33); }
@@ -588,8 +1030,8 @@ else if (curChar == 38)
                      { jjCheckNAddStates(31, 33); }
                   break;
                case 97:
-                  if (curChar == 34 && kind > 35)
-                     kind = 35;
+                  if (curChar == 34 && kind > 66)
+                     kind = 66;
                   break;
                case 100:
                case 101:
@@ -619,8 +1061,8 @@ else if (curChar == 38)
                      { jjCheckNAddStates(46, 48); }
                   break;
                case 120:
-                  if (curChar == 39 && kind > 34)
-                     kind = 34;
+                  if (curChar == 39 && kind > 65)
+                     kind = 65;
                   break;
                case 122:
                   { jjCheckNAddStates(49, 51); }
@@ -630,28 +1072,28 @@ else if (curChar == 38)
                      { jjCheckNAddStates(49, 51); }
                   break;
                case 124:
-                  if (curChar == 39 && kind > 36)
-                     kind = 36;
+                  if (curChar == 39 && kind > 67)
+                     kind = 67;
                   break;
                case 125:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 37)
-                     kind = 37;
+                  if (kind > 68)
+                     kind = 68;
                   { jjCheckNAddStates(16, 21); }
                   break;
                case 126:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 37)
-                     kind = 37;
+                  if (kind > 68)
+                     kind = 68;
                   { jjCheckNAdd(126); }
                   break;
                case 127:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 39)
-                     kind = 39;
+                  if (kind > 70)
+                     kind = 70;
                   { jjCheckNAdd(127); }
                   break;
                case 128:
@@ -665,8 +1107,8 @@ else if (curChar == 38)
                case 130:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 40)
-                     kind = 40;
+                  if (kind > 71)
+                     kind = 71;
                   { jjCheckNAdd(130); }
                   break;
                case 131:
@@ -680,8 +1122,8 @@ else if (curChar == 38)
                case 133:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 42)
-                     kind = 42;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(133, 134); }
                   break;
                case 134:
@@ -703,15 +1145,15 @@ else if (curChar == 38)
                case 138:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 42)
-                     kind = 42;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(134, 138); }
                   break;
                case 139:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 42)
-                     kind = 42;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(134, 139); }
                   break;
                case 140:
@@ -721,27 +1163,27 @@ else if (curChar == 38)
                case 141:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 41)
-                     kind = 41;
+                  if (kind > 72)
+                     kind = 72;
                   { jjCheckNAddStates(0, 4); }
                   break;
                case 142:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 41)
-                     kind = 41;
+                  if (kind > 72)
+                     kind = 72;
                   { jjCheckNAdd(142); }
                   break;
                case 143:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 42)
-                     kind = 42;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(143, 134); }
                   break;
                case 201:
-                  if (curChar == 50 && kind > 22)
-                     kind = 22;
+                  if (curChar == 50 && kind > 53)
+                     kind = 53;
                   break;
                default : break;
             }
@@ -757,42 +1199,44 @@ else if (curChar < 128)
                case 5:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 41)
-                        kind = 41;
+                     if (kind > 72)
+                        kind = 72;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0xf800000150000001L & l) != 0L)
                   {
-                     if (kind > 43)
-                        kind = 43;
+                     if (kind > 74)
+                        kind = 74;
                      { jjCheckNAddTwoStates(20, 21); }
                   }
-                  if ((0x100000001000L & l) != 0L)
-                     { jjCheckNAddStates(55, 61); }
+                  if ((0x40000000400000L & l) != 0L)
+                     { jjAddStates(55, 58); }
+                  else if ((0x100000001000L & l) != 0L)
+                     { jjCheckNAddStates(59, 65); }
                   else if ((0x400000004000L & l) != 0L)
-                     { jjCheckNAddStates(62, 67); }
+                     { jjCheckNAddStates(66, 71); }
                   else if ((0x800000008000L & l) != 0L)
                      { jjCheckNAddTwoStates(6, 77); }
                   else if ((0x200000002L & l) != 0L)
-                     { jjAddStates(68, 69); }
+                     { jjAddStates(72, 73); }
                   else if ((0x8000000080L & l) != 0L)
-                     { jjCheckNAddStates(70, 73); }
+                     { jjCheckNAddStates(74, 77); }
                   else if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(74, 75); }
+                     { jjAddStates(78, 79); }
                   else if ((0x400000004L & l) != 0L)
-                     { jjAddStates(76, 77); }
+                     { jjAddStates(80, 81); }
                   else if ((0x20000000200L & l) != 0L)
                      { jjCheckNAdd(6); }
                   else if ((0x1000000010L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 4;
                   else if (curChar == 96)
-                     { jjCheckNAddStates(78, 81); }
+                     { jjCheckNAddStates(82, 85); }
                   else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 11;
                   break;
                case 0:
-                  if ((0x8000000080L & l) != 0L && kind > 7)
-                     kind = 7;
+                  if ((0x8000000080L & l) != 0L && kind > 38)
+                     kind = 38;
                   break;
                case 1:
                   if ((0x400000004000L & l) != 0L)
@@ -811,16 +1255,16 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 3;
                   break;
                case 6:
-                  if ((0x400000004000L & l) != 0L && kind > 7)
-                     kind = 7;
+                  if ((0x400000004000L & l) != 0L && kind > 38)
+                     kind = 38;
                   break;
                case 7:
                   if ((0x20000000200L & l) != 0L)
                      { jjCheckNAdd(6); }
                   break;
                case 11:
-                  if (curChar == 124 && kind > 11)
-                     kind = 11;
+                  if (curChar == 124 && kind > 42)
+                     kind = 42;
                   break;
                case 12:
                   if (curChar == 124)
@@ -829,28 +1273,28 @@ else if (curChar == 124)
                case 20:
                   if ((0xf800000150000001L & l) == 0L)
                      break;
-                  if (kind > 43)
-                     kind = 43;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 21:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 43)
-                     kind = 43;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 22:
                   if ((0x400000004L & l) != 0L)
-                     { jjAddStates(76, 77); }
+                     { jjAddStates(80, 81); }
                   break;
                case 23:
-                  if ((0x80000000800000L & l) != 0L && kind > 13)
-                     kind = 13;
+                  if ((0x80000000800000L & l) != 0L && kind > 44)
+                     kind = 44;
                   break;
                case 24:
-                  if ((0x400000004000L & l) != 0L && kind > 13)
-                     kind = 13;
+                  if ((0x400000004000L & l) != 0L && kind > 44)
+                     kind = 44;
                   break;
                case 25:
                   if ((0x2000000020L & l) != 0L)
@@ -874,11 +1318,11 @@ else if (curChar == 124)
                   break;
                case 30:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(74, 75); }
+                     { jjAddStates(78, 79); }
                   break;
                case 31:
-                  if ((0x8000000080000L & l) != 0L && kind > 12)
-                     kind = 12;
+                  if ((0x8000000080000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 32:
                case 50:
@@ -900,16 +1344,16 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 34;
                   break;
                case 36:
-                  if ((0x2000000020000L & l) != 0L && kind > 12)
-                     kind = 12;
+                  if ((0x2000000020000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 37:
                   if ((0x8000000080L & l) != 0L)
-                     { jjCheckNAddStates(70, 73); }
+                     { jjCheckNAddStates(74, 77); }
                   break;
                case 38:
-                  if ((0x400000004000L & l) != 0L && kind > 12)
-                     kind = 12;
+                  if ((0x400000004000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 39:
                case 176:
@@ -953,8 +1397,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 47;
                   break;
                case 49:
-                  if ((0x10000000100000L & l) != 0L && kind > 12)
-                     kind = 12;
+                  if ((0x10000000100000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 51:
                   if ((0x200000002L & l) != 0L)
@@ -1033,8 +1477,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 68;
                   break;
                case 70:
-                  if ((0x2000000020L & l) != 0L && kind > 12)
-                     kind = 12;
+                  if ((0x2000000020L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 71:
                case 200:
@@ -1043,15 +1487,15 @@ else if (curChar == 124)
                   break;
                case 72:
                   if ((0x200000002L & l) != 0L)
-                     { jjAddStates(68, 69); }
+                     { jjAddStates(72, 73); }
                   break;
                case 73:
-                  if ((0x10000000100000L & l) != 0L && kind > 7)
-                     kind = 7;
+                  if ((0x10000000100000L & l) != 0L && kind > 38)
+                     kind = 38;
                   break;
                case 74:
-                  if ((0x1000000010L & l) != 0L && kind > 10)
-                     kind = 10;
+                  if ((0x1000000010L & l) != 0L && kind > 41)
+                     kind = 41;
                   break;
                case 75:
                   if ((0x400000004000L & l) != 0L)
@@ -1062,8 +1506,8 @@ else if (curChar == 124)
                      { jjCheckNAddTwoStates(6, 77); }
                   break;
                case 77:
-                  if ((0x4000000040000L & l) != 0L && kind > 11)
-                     kind = 11;
+                  if ((0x4000000040000L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 81:
                   if (curChar == 92)
@@ -1111,7 +1555,7 @@ else if (curChar == 124)
                   break;
                case 98:
                   if (curChar == 96)
-                     { jjCheckNAddStates(78, 81); }
+                     { jjCheckNAddStates(82, 85); }
                   break;
                case 99:
                   if (curChar == 92)
@@ -1125,8 +1569,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(34, 36); }
                   break;
                case 102:
-                  if (curChar == 96 && kind > 34)
-                     kind = 34;
+                  if (curChar == 96 && kind > 65)
+                     kind = 65;
                   break;
                case 103:
                   if (curChar == 92)
@@ -1140,8 +1584,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(37, 39); }
                   break;
                case 106:
-                  if (curChar == 96 && kind > 36)
-                     kind = 36;
+                  if (curChar == 96 && kind > 67)
+                     kind = 67;
                   break;
                case 108:
                   if (curChar == 92)
@@ -1190,34 +1634,34 @@ else if (curChar == 124)
                case 139:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 42)
-                     kind = 42;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(134, 139); }
                   break;
                case 141:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 41)
-                     kind = 41;
+                  if (kind > 72)
+                     kind = 72;
                   { jjCheckNAddStates(0, 4); }
                   break;
                case 142:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 41)
-                     kind = 41;
+                  if (kind > 72)
+                     kind = 72;
                   { jjCheckNAdd(142); }
                   break;
                case 143:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 42)
-                     kind = 42;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(143, 134); }
                   break;
                case 144:
                   if ((0x400000004000L & l) != 0L)
-                     { jjCheckNAddStates(62, 67); }
+                     { jjCheckNAddStates(66, 71); }
                   break;
                case 146:
                   if ((0x200000002L & l) != 0L)
@@ -1248,8 +1692,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 151;
                   break;
                case 153:
-                  if ((0x100000001000000L & l) != 0L && kind > 24)
-                     kind = 24;
+                  if ((0x100000001000000L & l) != 0L && kind > 55)
+                     kind = 55;
                   break;
                case 154:
                case 158:
@@ -1293,8 +1737,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 163;
                   break;
                case 165:
-                  if ((0x2000000020L & l) != 0L && kind > 26)
-                     kind = 26;
+                  if ((0x2000000020L & l) != 0L && kind > 57)
+                     kind = 57;
                   break;
                case 166:
                case 169:
@@ -1331,7 +1775,7 @@ else if (curChar == 124)
                   break;
                case 175:
                   if ((0x100000001000L & l) != 0L)
-                     { jjCheckNAddStates(55, 61); }
+                     { jjCheckNAddStates(59, 65); }
                   break;
                case 177:
                   if ((0x10000000100L & l) != 0L)
@@ -1442,8 +1886,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 205;
                   break;
                case 207:
-                  if ((0x800000008000L & l) != 0L && kind > 22)
-                     kind = 22;
+                  if ((0x800000008000L & l) != 0L && kind > 53)
+                     kind = 53;
                   break;
                case 208:
                   if ((0x10000000100000L & l) != 0L)
@@ -1469,6 +1913,188 @@ else if (curChar == 124)
                   if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 212;
                   break;
+               case 214:
+                  if ((0x40000000400000L & l) != 0L)
+                     { jjAddStates(55, 58); }
+                  break;
+               case 215:
+                  if ((0x1000000010000L & l) != 0L && kind > 7)
+                     kind = 7;
+                  break;
+               case 216:
+               case 227:
+                  if ((0x200000002L & l) != 0L)
+                     { jjCheckNAdd(215); }
+                  break;
+               case 217:
+                  if ((0x80000000800000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 216;
+                  break;
+               case 218:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 217;
+                  break;
+               case 219:
+                  if ((0x1000000010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 218;
+                  break;
+               case 220:
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 219;
+                  break;
+               case 221:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 220;
+                  break;
+               case 222:
+                  if ((0x200000002000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 221;
+                  break;
+               case 223:
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 222;
+                  break;
+               case 224:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 223;
+                  break;
+               case 225:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 224;
+                  break;
+               case 226:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 225;
+                  break;
+               case 228:
+                  if ((0x80000000800000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 227;
+                  break;
+               case 229:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 228;
+                  break;
+               case 230:
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 229;
+                  break;
+               case 231:
+                  if ((0x1000000010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 230;
+                  break;
+               case 232:
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 231;
+                  break;
+               case 233:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 232;
+                  break;
+               case 234:
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 233;
+                  break;
+               case 235:
+                  if ((0x200000002000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 234;
+                  break;
+               case 236:
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 235;
+                  break;
+               case 237:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 236;
+                  break;
+               case 238:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 237;
+                  break;
+               case 239:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 238;
+                  break;
+               case 240:
+                  if ((0x10000000100000L & l) != 0L && kind > 8)
+                     kind = 8;
+                  break;
+               case 241:
+               case 250:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjCheckNAdd(240); }
+                  break;
+               case 242:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 241;
+                  break;
+               case 243:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 242;
+                  break;
+               case 244:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 243;
+                  break;
+               case 245:
+                  if ((0x200000002000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 244;
+                  break;
+               case 246:
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 245;
+                  break;
+               case 247:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 246;
+                  break;
+               case 248:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 247;
+                  break;
+               case 249:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 248;
+                  break;
+               case 251:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 250;
+                  break;
+               case 252:
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 251;
+                  break;
+               case 253:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 252;
+                  break;
+               case 254:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 253;
+                  break;
+               case 255:
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 254;
+                  break;
+               case 256:
+                  if ((0x200000002000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 255;
+                  break;
+               case 257:
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 256;
+                  break;
+               case 258:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 257;
+                  break;
+               case 259:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 258;
+                  break;
+               case 260:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 259;
+                  break;
                default : break;
             }
          } while(i != startsAt);
@@ -1487,25 +2113,25 @@ else if (curChar == 124)
                case 5:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                   {
-                     if (kind > 43)
-                        kind = 43;
+                     if (kind > 74)
+                        kind = 74;
                      { jjCheckNAddTwoStates(20, 21); }
                   }
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(82, 85); }
-                  if (jjCanMove_4(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(86, 89); }
+                  if (jjCanMove_4(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddStates(90, 93); }
                   break;
                case 20:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 43)
-                     kind = 43;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 80:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(82, 85); }
+                     { jjCheckNAddStates(86, 89); }
                   break;
                case 82:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -1516,8 +2142,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(22, 24); }
                   break;
                case 84:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 34)
-                     kind = 34;
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 65)
+                     kind = 65;
                   break;
                case 86:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -1528,8 +2154,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(25, 27); }
                   break;
                case 88:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 35)
-                     kind = 35;
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 66)
+                     kind = 66;
                   break;
                case 91:
                case 92:
@@ -1553,7 +2179,7 @@ else if (curChar == 124)
                   break;
                case 107:
                   if (jjCanMove_4(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(86, 89); }
+                     { jjCheckNAddStates(90, 93); }
                   break;
                case 109:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -1564,8 +2190,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(40, 42); }
                   break;
                case 111:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 34)
-                     kind = 34;
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 65)
+                     kind = 65;
                   break;
                case 113:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -1576,8 +2202,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(43, 45); }
                   break;
                case 115:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 36)
-                     kind = 36;
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 67)
+                     kind = 67;
                   break;
                case 118:
                case 119:
@@ -1600,7 +2226,7 @@ else if (curChar == 124)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 214 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 261 - (jjnewStateCnt = startsAt)))
          break;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { break; }
@@ -1628,10 +2254,13 @@ else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
 
 /** Token literal values. */
 public static final String[] jjstrLiteralImages = {
-"", null, null, "\50", "\51", "\133", "\135", null, null, null, null, null, 
-null, null, "\74", "\76", null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, "\174", null, null, null, null, "\54", 
-null, null, null, null, null, null, null, null, null, "\12", "\137", "\75", };
+"", null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, "\173", "\175", "\72", "\50", "\51", "\133", "\135", null, 
+null, null, null, null, null, null, "\74", "\76", null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, "\174", null, null, 
+null, null, "\54", null, null, null, null, null, null, null, null, null, "\12", 
+"\137", "\75", };
 protected Token jjFillToken()
 {
    final Token t;
@@ -1659,9 +2288,9 @@ protected Token jjFillToken()
    142, 143, 134, 20, 21, 127, 128, 131, 117, 119, 121, 123, 90, 92, 94, 96, 
    126, 127, 128, 129, 131, 132, 81, 83, 84, 85, 87, 88, 90, 92, 93, 94, 
    96, 97, 99, 101, 102, 103, 105, 106, 108, 110, 111, 112, 114, 115, 117, 119, 
-   120, 121, 123, 124, 135, 136, 139, 182, 49, 199, 200, 204, 206, 213, 152, 70, 
-   157, 164, 168, 174, 73, 75, 48, 49, 69, 71, 35, 36, 23, 29, 99, 101, 
-   103, 105, 81, 83, 85, 87, 108, 110, 112, 114, 
+   120, 121, 123, 124, 135, 136, 139, 226, 239, 249, 260, 182, 49, 199, 200, 204, 
+   206, 213, 152, 70, 157, 164, 168, 174, 73, 75, 48, 49, 69, 71, 35, 36, 
+   23, 29, 99, 101, 103, 105, 81, 83, 85, 87, 108, 110, 112, 114, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -1897,7 +2526,7 @@ private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 214; i-- > 0;)
+    for (i = 261; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
@@ -1928,24 +2557,25 @@ public void SwitchTo(int lexState)
 public static final int[] jjnewLexState = {
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0x70ffff7c0fff9L, 
+   0xfbe07ffffffffff9L, 0x387ffL, 
 };
 static final long[] jjtoSkip = {
-   0x6L, 
+   0x6L, 0x0L, 
 };
 static final long[] jjtoSpecial = {
-   0x0L, 
+   0x0L, 0x0L, 
 };
 static final long[] jjtoMore = {
-   0x0L, 
+   0x0L, 0x0L, 
 };
     protected SimpleCharStream  input_stream;
 
-    private final int[] jjrounds = new int[214];
-    private final int[] jjstateSet = new int[2 * 214];
+    private final int[] jjrounds = new int[261];
+    private final int[] jjstateSet = new int[2 * 261];
     private final StringBuilder jjimage = new StringBuilder();
     private StringBuilder image = jjimage;
     private int jjimageLen;
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarTreeConstants.java b/src/main/java/com/cinchapi/ccl/generated/GrammarTreeConstants.java
index af353480..815f5841 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarTreeConstants.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarTreeConstants.java
@@ -11,6 +11,7 @@ public interface GrammarTreeConstants
   public int JJTPAGE = 5;
   public int JJTORDER = 6;
   public int JJTFUNCTION = 7;
+  public int JJTCOMMAND = 8;
 
 
   public String[] jjtNodeName = {
@@ -22,6 +23,7 @@ public interface GrammarTreeConstants
     "Page",
     "Order",
     "Function",
+    "Command",
   };
 }
-/* JavaCC - OriginalChecksum=29ddeb38cd508025cb43ec1e431bcba8 (do not edit this line) */
+/* JavaCC - OriginalChecksum=d446f271512c22f38838e63d1e478959 (do not edit this line) */
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarVisitor.java b/src/main/java/com/cinchapi/ccl/generated/GrammarVisitor.java
index 096a966f..098c7633 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarVisitor.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarVisitor.java
@@ -11,5 +11,6 @@ public interface GrammarVisitor
   public Object visit(ASTPage node, Object data);
   public Object visit(ASTOrder node, Object data);
   public Object visit(ASTFunction node, Object data);
+  public Object visit(ASTCommand node, Object data);
 }
-/* JavaCC - OriginalChecksum=14ba7aaa5410f8133ad72964d79c3712 (do not edit this line) */
+/* JavaCC - OriginalChecksum=005bca7a83b4cfabc7e039633def1d0f (do not edit this line) */
diff --git a/src/main/java/com/cinchapi/ccl/grammar/CommandSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/QuerySymbol.java
similarity index 87%
rename from src/main/java/com/cinchapi/ccl/grammar/CommandSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/QuerySymbol.java
index e262d486..f14c4a34 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/CommandSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/QuerySymbol.java
@@ -16,10 +16,10 @@
 package com.cinchapi.ccl.grammar;
 
 /**
- * A {@link Symbol} that represents a "command".
+ * A {@link Symbol} that represents a "query".
  *
  * @author Jeff Nelson
  */
-public enum CommandSymbol implements Symbol {
+public enum QuerySymbol implements Symbol {
     IMPLICIT
 }
diff --git a/src/main/java/com/cinchapi/ccl/grammar/TimestampSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/TimestampSymbol.java
index 6402dab8..21824678 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/TimestampSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/TimestampSymbol.java
@@ -17,6 +17,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
 import com.cinchapi.common.base.AnyStrings;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.Longs;
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/AbortSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/AbortSymbol.java
new file mode 100644
index 00000000..6d93dc3c
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/AbortSymbol.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+/**
+ * A {@link CommandSymbol} that represents an ABORT command.
+ */
+public class AbortSymbol implements CommandSymbol {
+    /**
+     * Singleton instance.
+     */
+    public static final AbortSymbol INSTANCE = new AbortSymbol();
+
+    private AbortSymbol() {
+        // Use INSTANCE
+    }
+
+    @Override
+    public String type() {
+        return "ABORT";
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java
new file mode 100644
index 00000000..a02143e7
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import com.cinchapi.ccl.grammar.command.CommandSymbol;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents an ADD command.
+ */
+public class AddSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final ValueSymbol value;
+    private final long record;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to add
+     * @param value the value to add
+     * @param record the record identifier
+     */
+    public AddSymbol(KeySymbol key, ValueSymbol value, long record) {
+        this.key = key;
+        this.value = value;
+        this.record = record;
+    }
+
+    @Override
+    public String type() {
+        return "ADD";
+    }
+
+    /**
+     * Return the key to add.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the value to add.
+     */
+    public ValueSymbol value() {
+        return value;
+    }
+
+    /**
+     * Return the record identifier.
+     */
+    public long record() {
+        return record;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java
new file mode 100644
index 00000000..b6f8cf08
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeySymbol;
+
+/**
+ * A {@link CommandSymbol} that represents an AUDIT command.
+ */
+public class AuditSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final long record;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key optional key to audit, if null audits entire record
+     * @param record the record identifier
+     */
+    public AuditSymbol(@Nullable KeySymbol key, long record) {
+        this.key = key;
+        this.record = record;
+    }
+
+    @Override
+    public String type() {
+        return "AUDIT";
+    }
+
+    /**
+     * Return the key to audit, if specified.
+     */
+    @Nullable
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the record identifier.
+     */
+    public long record() {
+        return record;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/ClearSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/ClearSymbol.java
new file mode 100644
index 00000000..4fb42a31
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/ClearSymbol.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeySymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a CLEAR command.
+ */
+public class ClearSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final Collection<KeySymbol> keys;
+    private final long record;
+    private final Collection<Long> records;
+
+    /**
+     * Construct a new instance for single key and record.
+     */
+    public ClearSymbol(KeySymbol key, long record) {
+        this(key, null, record, null);
+    }
+
+    /**
+     * Construct a new instance for multiple keys and single record.
+     */
+    public ClearSymbol(Collection<KeySymbol> keys, long record) {
+        this(null, keys, record, null);
+    }
+
+    /**
+     * Construct a new instance for single key and multiple records.
+     */
+    public ClearSymbol(KeySymbol key, Collection<Long> records) {
+        this(key, null, -1, records);
+    }
+
+    /**
+     * Construct a new instance for multiple keys and records.
+     */
+    public ClearSymbol(Collection<KeySymbol> keys, Collection<Long> records) {
+        this(null, keys, -1, records);
+    }
+
+    private ClearSymbol(@Nullable KeySymbol key, @Nullable Collection<KeySymbol> keys,
+                        long record, @Nullable Collection<Long> records) {
+        this.key = key;
+        this.keys = keys;
+        this.record = record;
+        this.records = records;
+    }
+
+    @Override
+    public String type() {
+        return "CLEAR";
+    }
+
+    /**
+     * Return the key to clear, if operating on a single key.
+     */
+    @Nullable
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the keys to clear, if operating on multiple keys.
+     */
+    @Nullable
+    public Collection<KeySymbol> keys() {
+        return keys;
+    }
+
+    /**
+     * Return the record identifier, if operating on a single record.
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the record identifiers, if operating on multiple records.
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/CommandSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/CommandSymbol.java
new file mode 100644
index 00000000..9299ca2e
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/CommandSymbol.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import com.cinchapi.ccl.grammar.Symbol;
+
+/**
+ * A {@link Symbol} that represents a command operation.
+ */
+public interface CommandSymbol extends Symbol {
+    /**
+     * Return the type of command.
+     */
+    String type();
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/CommitSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/CommitSymbol.java
new file mode 100644
index 00000000..bee88e49
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/CommitSymbol.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+/**
+ * A {@link CommandSymbol} that represents a COMMIT command.
+ */
+public class CommitSymbol implements CommandSymbol {
+    /**
+     * Singleton instance.
+     */
+    public static final CommitSymbol INSTANCE = new CommitSymbol();
+
+    private CommitSymbol() {
+        // Use INSTANCE
+    }
+
+    @Override
+    public String type() {
+        return "COMMIT";
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/DescribeSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/DescribeSymbol.java
new file mode 100644
index 00000000..b8ebdd6f
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/DescribeSymbol.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a DESCRIBE command.
+ */
+public class DescribeSymbol implements CommandSymbol {
+    private final long record;
+    private final Collection<Long> records;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance for a single record.
+     */
+    public DescribeSymbol(long record, @Nullable TimestampSymbol timestamp) {
+        this(record, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for multiple records.
+     */
+    public DescribeSymbol(Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+        this(-1, records, timestamp);
+    }
+
+    private DescribeSymbol(long record, @Nullable Collection<Long> records,
+                           @Nullable TimestampSymbol timestamp) {
+        this.record = record;
+        this.records = records;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "DESCRIBE";
+    }
+
+    /**
+     * Return the record identifier, if operating on a single record.
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the record identifiers, if operating on multiple records.
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+
+    /**
+     * Return the timestamp for historical describe.
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java
new file mode 100644
index 00000000..626753ee
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a FETCH command.
+ */
+public class FetchSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final Collection<KeySymbol> keys;
+    private final long record;
+    private final Collection<Long> records;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance for single key and record.
+     */
+    public FetchSymbol(KeySymbol key, long record, @Nullable TimestampSymbol timestamp) {
+        this(key, null, record, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for multiple keys and single record.
+     */
+    public FetchSymbol(Collection<KeySymbol> keys, long record, @Nullable TimestampSymbol timestamp) {
+        this(null, keys, record, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for single key and multiple records.
+     */
+    public FetchSymbol(KeySymbol key, Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+        this(key, null, -1, records, timestamp);
+    }
+
+    /**
+     * Construct a new instance for multiple keys and records.
+     */
+    public FetchSymbol(Collection<KeySymbol> keys, Collection<Long> records,
+                       @Nullable TimestampSymbol timestamp) {
+        this(null, keys, -1, records, timestamp);
+    }
+
+    private FetchSymbol(@Nullable KeySymbol key, @Nullable Collection<KeySymbol> keys,
+                        long record, @Nullable Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+        this.key = key;
+        this.keys = keys;
+        this.record = record;
+        this.records = records;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "FETCH";
+    }
+
+    /**
+     * Return the key to fetch, if operating on a single key.
+     */
+    @Nullable
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the keys to fetch, if operating on multiple keys.
+     */
+    @Nullable
+    public Collection<KeySymbol> keys() {
+        return keys;
+    }
+
+    /**
+     * Return the record identifier, if operating on a single record.
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the record identifiers, if operating on multiple records.
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+
+    /**
+     * Return the timestamp for historical fetch.
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java
new file mode 100644
index 00000000..54950b5b
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+import com.cinchapi.ccl.type.Operator;
+
+/**
+ * A {@link CommandSymbol} that represents a FIND command.
+ */
+public class FindSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final Operator operator;
+    private final ValueSymbol value;
+    private final ValueSymbol value2;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance for unary operation.
+     *
+     * @param key the key to find
+     * @param operator the operator to use
+     * @param value the value to compare
+     * @param timestamp optional timestamp for historical search
+     */
+    public FindSymbol(KeySymbol key, Operator operator, ValueSymbol value,
+                      @Nullable TimestampSymbol timestamp) {
+        this(key, operator, value, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for binary operation.
+     *
+     * @param key the key to find
+     * @param operator the operator to use
+     * @param value the first value to compare
+     * @param value2 the second value to compare
+     * @param timestamp optional timestamp for historical search
+     */
+    public FindSymbol(KeySymbol key, Operator operator, ValueSymbol value,
+                      @Nullable ValueSymbol value2, @Nullable TimestampSymbol timestamp) {
+        this.key = key;
+        this.operator = operator;
+        this.value = value;
+        this.value2 = value2;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "FIND";
+    }
+
+    /**
+     * Return the key to find.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the operator to use.
+     */
+    public Operator operator() {
+        return operator;
+    }
+
+    /**
+     * Return the value to compare.
+     */
+    public ValueSymbol value() {
+        return value;
+    }
+
+    /**
+     * Return the second value for binary operations.
+     */
+    @Nullable
+    public ValueSymbol value2() {
+        return value2;
+    }
+
+    /**
+     * Return the timestamp for historical search.
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java
new file mode 100644
index 00000000..88acb79c
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a GET command.
+ */
+public class GetSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final Collection<KeySymbol> keys;
+    private final long record;
+    private final Collection<Long> records;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance for single key and record.
+     */
+    public GetSymbol(KeySymbol key, long record, @Nullable TimestampSymbol timestamp) {
+        this(key, null, record, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for multiple keys and single record.
+     */
+    public GetSymbol(Collection<KeySymbol> keys, long record, @Nullable TimestampSymbol timestamp) {
+        this(null, keys, record, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for single key and multiple records.
+     */
+    public GetSymbol(KeySymbol key, Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+        this(key, null, -1, records, timestamp);
+    }
+
+    /**
+     * Construct a new instance for multiple keys and records.
+     */
+    public GetSymbol(Collection<KeySymbol> keys, Collection<Long> records,
+                     @Nullable TimestampSymbol timestamp) {
+        this(null, keys, -1, records, timestamp);
+    }
+
+    private GetSymbol(@Nullable KeySymbol key, @Nullable Collection<KeySymbol> keys,
+                      long record, @Nullable Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+        this.key = key;
+        this.keys = keys;
+        this.record = record;
+        this.records = records;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "GET";
+    }
+
+    /**
+     * Return the key to get, if operating on a single key.
+     */
+    @Nullable
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the keys to get, if operating on multiple keys.
+     */
+    @Nullable
+    public Collection<KeySymbol> keys() {
+        return keys;
+    }
+
+    /**
+     * Return the record identifier, if operating on a single record.
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the record identifiers, if operating on multiple records.
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+
+    /**
+     * Return the timestamp for historical get.
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/InsertSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/InsertSymbol.java
new file mode 100644
index 00000000..04fc4f81
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/InsertSymbol.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+
+/**
+ * A {@link CommandSymbol} that represents an INSERT command.
+ */
+public class InsertSymbol implements CommandSymbol {
+    private final String json;
+    private final Long record;
+    private final Collection<Long> records;
+
+    /**
+     * Construct a new instance for insertion into a new record.
+     *
+     * @param json the JSON formatted data to insert
+     */
+    public InsertSymbol(String json) {
+        this(json, null, null);
+    }
+
+    /**
+     * Construct a new instance for insertion into a single record.
+     *
+     * @param json the JSON formatted data to insert
+     * @param record the record identifier
+     */
+    public InsertSymbol(String json, long record) {
+        this(json, record, null);
+    }
+
+    /**
+     * Construct a new instance for insertion into multiple records.
+     *
+     * @param json the JSON formatted data to insert
+     * @param records the record identifiers
+     */
+    public InsertSymbol(String json, Collection<Long> records) {
+        this(json, null, records);
+    }
+
+    private InsertSymbol(String json, @Nullable Long record,
+                         @Nullable Collection<Long> records) {
+        this.json = json;
+        this.record = record;
+        this.records = records;
+    }
+
+    @Override
+    public String type() {
+        return "INSERT";
+    }
+
+    /**
+     * Return the JSON formatted data to insert.
+     */
+    public String json() {
+        return json;
+    }
+
+    /**
+     * Return the record identifier if inserting into a single record.
+     */
+    @Nullable
+    public Long record() {
+        return record;
+    }
+
+    /**
+     * Return the record identifiers if inserting into multiple records.
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/LinkSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/LinkSymbol.java
new file mode 100644
index 00000000..042bea0e
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/LinkSymbol.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import com.cinchapi.ccl.grammar.KeySymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a LINK command.
+ */
+public class LinkSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final long source;
+    private final Collection<Long> destinations;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to link
+     * @param source the source record
+     * @param destinations the destination records
+     */
+    public LinkSymbol(KeySymbol key, long source, Collection<Long> destinations) {
+        this.key = key;
+        this.source = source;
+        this.destinations = destinations;
+    }
+
+    @Override
+    public String type() {
+        return "LINK";
+    }
+
+    /**
+     * Return the key to link.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the source record.
+     */
+    public long source() {
+        return source;
+    }
+
+    /**
+     * Return the destination records.
+     */
+    public Collection<Long> destinations() {
+        return destinations;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/PingSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/PingSymbol.java
new file mode 100644
index 00000000..5ccc14c0
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/PingSymbol.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+
+/**
+ * A {@link CommandSymbol} that represents a PING command.
+ */
+public class PingSymbol implements CommandSymbol {
+    private final long record;
+    private final Collection<Long> records;
+
+    /**
+     * Construct a new instance for a single record.
+     *
+     * @param record the record identifier
+     */
+    public PingSymbol(long record) {
+        this(record, null);
+    }
+
+    /**
+     * Construct a new instance for multiple records.
+     *
+     * @param records the record identifiers
+     */
+    public PingSymbol(Collection<Long> records) {
+        this(-1, records);
+    }
+
+    private PingSymbol(long record, @Nullable Collection<Long> records) {
+        this.record = record;
+        this.records = records;
+    }
+
+    @Override
+    public String type() {
+        return "PING";
+    }
+
+    /**
+     * Return the record identifier if pinging a single record.
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the record identifiers if pinging multiple records.
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java
new file mode 100644
index 00000000..e6b2ead5
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a REMOVE command.
+ */
+public class RemoveSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final ValueSymbol value;
+    private final long record;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to remove
+     * @param value the value to remove, if specified
+     * @param record the record identifier
+     */
+    public RemoveSymbol(KeySymbol key, @Nullable ValueSymbol value, long record) {
+        this.key = key;
+        this.value = value;
+        this.record = record;
+    }
+
+    @Override
+    public String type() {
+        return "REMOVE";
+    }
+
+    /**
+     * Return the key to remove.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the value to remove, if specified.
+     */
+    @Nullable
+    public ValueSymbol value() {
+        return value;
+    }
+
+    /**
+     * Return the record identifier.
+     */
+    public long record() {
+        return record;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/RevertSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/RevertSymbol.java
new file mode 100644
index 00000000..11705d53
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/RevertSymbol.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a REVERT command.
+ */
+public class RevertSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final Collection<KeySymbol> keys;
+    private final long record;
+    private final Collection<Long> records;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance for single key and record.
+     *
+     * @param key the key to revert
+     * @param record the record identifier
+     * @param timestamp the timestamp to revert to
+     */
+    public RevertSymbol(KeySymbol key, long record, TimestampSymbol timestamp) {
+        this(key, null, record, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for multiple keys and single record.
+     *
+     * @param keys the keys to revert
+     * @param record the record identifier
+     * @param timestamp the timestamp to revert to
+     */
+    public RevertSymbol(Collection<KeySymbol> keys, long record, TimestampSymbol timestamp) {
+        this(null, keys, record, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for single key and multiple records.
+     *
+     * @param key the key to revert
+     * @param records the record identifiers
+     * @param timestamp the timestamp to revert to
+     */
+    public RevertSymbol(KeySymbol key, Collection<Long> records, TimestampSymbol timestamp) {
+        this(key, null, -1, records, timestamp);
+    }
+
+    /**
+     * Construct a new instance for multiple keys and records.
+     *
+     * @param keys the keys to revert
+     * @param records the record identifiers
+     * @param timestamp the timestamp to revert to
+     */
+    public RevertSymbol(Collection<KeySymbol> keys, Collection<Long> records,
+                        TimestampSymbol timestamp) {
+        this(null, keys, -1, records, timestamp);
+    }
+
+    private RevertSymbol(@Nullable KeySymbol key, @Nullable Collection<KeySymbol> keys,
+                         long record, @Nullable Collection<Long> records, TimestampSymbol timestamp) {
+        this.key = key;
+        this.keys = keys;
+        this.record = record;
+        this.records = records;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "REVERT";
+    }
+
+    /**
+     * Return the key to revert, if operating on a single key.
+     */
+    @Nullable
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the keys to revert, if operating on multiple keys.
+     */
+    @Nullable
+    public Collection<KeySymbol> keys() {
+        return keys;
+    }
+
+    /**
+     * Return the record identifier, if operating on a single record.
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the record identifiers, if operating on multiple records.
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+
+    /**
+     * Return the timestamp to revert to.
+     */
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/SearchSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/SearchSymbol.java
new file mode 100644
index 00000000..841224aa
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/SearchSymbol.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import com.cinchapi.ccl.grammar.KeySymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a SEARCH command.
+ */
+public class SearchSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final String query;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to search
+     * @param query the search query
+     */
+    public SearchSymbol(KeySymbol key, String query) {
+        this.key = key;
+        this.query = query;
+    }
+
+    @Override
+    public String type() {
+        return "SEARCH";
+    }
+
+    /**
+     * Return the key to search.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the search query.
+     */
+    public String query() {
+        return query;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java
new file mode 100644
index 00000000..8163d8a0
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+import javax.annotation.Nullable;
+
+/**
+ * A {@link CommandSymbol} that represents a SELECT command.
+ */
+public class SelectSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final long record;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to select
+     * @param record the record identifier
+     * @param timestamp optional timestamp for historical queries
+     */
+    public SelectSymbol(KeySymbol key, long record, @Nullable TimestampSymbol timestamp) {
+        this.key = key;
+        this.record = record;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "SELECT";
+    }
+
+    /**
+     * Return the key to select.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the record identifier.
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the timestamp for historical queries.
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/SetSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/SetSymbol.java
new file mode 100644
index 00000000..932a450b
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/SetSymbol.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a SET command.
+ */
+public class SetSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final ValueSymbol value;
+    private final long record;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to set
+     * @param value the value to set
+     * @param record the record identifier
+     */
+    public SetSymbol(KeySymbol key, ValueSymbol value, long record) {
+        this.key = key;
+        this.value = value;
+        this.record = record;
+    }
+
+    @Override
+    public String type() {
+        return "SET";
+    }
+
+    /**
+     * Return the key to set.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the value to set.
+     */
+    public ValueSymbol value() {
+        return value;
+    }
+
+    /**
+     * Return the record identifier.
+     */
+    public long record() {
+        return record;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/StageSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/StageSymbol.java
new file mode 100644
index 00000000..5edbd268
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/StageSymbol.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+/**
+ * A {@link CommandSymbol} that represents a STAGE command.
+ */
+public class StageSymbol implements CommandSymbol {
+    /**
+     * Singleton instance.
+     */
+    public static final StageSymbol INSTANCE = new StageSymbol();
+
+    private StageSymbol() {
+        // Use INSTANCE
+    }
+
+    @Override
+    public String type() {
+        return "STAGE";
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/UnlinkSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/UnlinkSymbol.java
new file mode 100644
index 00000000..037905e3
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/UnlinkSymbol.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import com.cinchapi.ccl.grammar.KeySymbol;
+
+/**
+ * A {@link CommandSymbol} that represents an UNLINK command.
+ */
+public class UnlinkSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final long source;
+    private final Collection<Long> destinations;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to unlink
+     * @param source the source record
+     * @param destinations the destination records
+     */
+    public UnlinkSymbol(KeySymbol key, long source, Collection<Long> destinations) {
+        this.key = key;
+        this.source = source;
+        this.destinations = destinations;
+    }
+
+    @Override
+    public String type() {
+        return "UNLINK";
+    }
+
+    /**
+     * Return the key to unlink.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the source record.
+     */
+    public long source() {
+        return source;
+    }
+
+    /**
+     * Return the destination records.
+     */
+    public Collection<Long> destinations() {
+        return destinations;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/VerifyAndSwapSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/VerifyAndSwapSymbol.java
new file mode 100644
index 00000000..1803fef1
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/VerifyAndSwapSymbol.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a VERIFY AND SWAP command.
+ */
+public class VerifyAndSwapSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final ValueSymbol expected;
+    private final ValueSymbol replacement;
+    private final long record;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to verify and swap
+     * @param expected the expected value
+     * @param replacement the replacement value
+     * @param record the record identifier
+     */
+    public VerifyAndSwapSymbol(KeySymbol key, ValueSymbol expected,
+                               ValueSymbol replacement, long record) {
+        this.key = key;
+        this.expected = expected;
+        this.replacement = replacement;
+        this.record = record;
+    }
+
+    @Override
+    public String type() {
+        return "VERIFY_AND_SWAP";
+    }
+
+    /**
+     * Return the key to verify and swap.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the expected value.
+     */
+    public ValueSymbol expected() {
+        return expected;
+    }
+
+    /**
+     * Return the replacement value.
+     */
+    public ValueSymbol replacement() {
+        return replacement;
+    }
+
+    /**
+     * Return the record identifier.
+     */
+    public long record() {
+        return record;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/VerifyOrSetSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/VerifyOrSetSymbol.java
new file mode 100644
index 00000000..63ca82df
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/VerifyOrSetSymbol.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a VERIFY OR SET command.
+ */
+public class VerifyOrSetSymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final ValueSymbol value;
+    private final long record;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to verify or set
+     * @param value the value to verify or set
+     * @param record the record identifier
+     */
+    public VerifyOrSetSymbol(KeySymbol key, ValueSymbol value, long record) {
+        this.key = key;
+        this.value = value;
+        this.record = record;
+    }
+
+    @Override
+    public String type() {
+        return "VERIFY_OR_SET";
+    }
+
+    /**
+     * Return the key to verify or set.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the value to verify or set.
+     */
+    public ValueSymbol value() {
+        return value;
+    }
+
+    /**
+     * Return the record identifier.
+     */
+    public long record() {
+        return record;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/VerifySymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/VerifySymbol.java
new file mode 100644
index 00000000..f59ea2eb
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/VerifySymbol.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a VERIFY command.
+ */
+public class VerifySymbol implements CommandSymbol {
+    private final KeySymbol key;
+    private final ValueSymbol value;
+    private final long record;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the key to verify
+     * @param value the value to verify
+     * @param record the record identifier
+     * @param timestamp optional timestamp for historical verification
+     */
+    public VerifySymbol(KeySymbol key, ValueSymbol value, long record,
+                        @Nullable TimestampSymbol timestamp) {
+        this.key = key;
+        this.value = value;
+        this.record = record;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "VERIFY";
+    }
+
+    /**
+     * Return the key to verify.
+     */
+    public KeySymbol key() {
+        return key;
+    }
+
+    /**
+     * Return the value to verify.
+     */
+    public ValueSymbol value() {
+        return value;
+    }
+
+    /**
+     * Return the record identifier.
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the timestamp for historical verification.
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/Expression.java b/src/main/java/com/cinchapi/ccl/grammar/condition/Expression.java
similarity index 96%
rename from src/main/java/com/cinchapi/ccl/grammar/Expression.java
rename to src/main/java/com/cinchapi/ccl/grammar/condition/Expression.java
index 514e0a3b..daacb6b2 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/Expression.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/condition/Expression.java
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar;
+package com.cinchapi.ccl.grammar.condition;
+
+import com.cinchapi.ccl.grammar.*;
 
 import java.util.List;
 
@@ -48,7 +50,7 @@ public class Expression implements ExpressionSymbol {
      */
     @Deprecated
     public Expression(KeySymbol key, OperatorSymbol operator,
-            ValueSymbol... values) {
+                      ValueSymbol... values) {
         this.delegate = ExpressionSymbol.create(null, key, operator, values);
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/ExpressionSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/condition/ExpressionSymbol.java
similarity index 96%
rename from src/main/java/com/cinchapi/ccl/grammar/ExpressionSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/condition/ExpressionSymbol.java
index 25a35278..9d55abd2 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/ExpressionSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/condition/ExpressionSymbol.java
@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar;
+package com.cinchapi.ccl.grammar.condition;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.cinchapi.ccl.generated.ASTExpression;
+import com.cinchapi.ccl.grammar.*;
 import com.cinchapi.ccl.type.Operator;
 
 /**
@@ -45,7 +46,7 @@ public interface ExpressionSymbol extends PostfixNotationSymbol {
      * @return a new {@link ExpressionSymbol}
      */
     public static ExpressionSymbol create(KeyTokenSymbol<?> key,
-            OperatorSymbol operator, ValueTokenSymbol<?>... values) {
+                                          OperatorSymbol operator, ValueTokenSymbol<?>... values) {
         return create(null, key, operator, values);
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/FunctionKeySymbol.java b/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionKeySymbol.java
similarity index 92%
rename from src/main/java/com/cinchapi/ccl/grammar/FunctionKeySymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/condition/FunctionKeySymbol.java
index 57ff5091..5e48323e 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/FunctionKeySymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionKeySymbol.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar;
+package com.cinchapi.ccl.grammar.condition;
 
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.type.Function;
 
 /**
diff --git a/src/main/java/com/cinchapi/ccl/grammar/FunctionTokenSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionTokenSymbol.java
similarity index 91%
rename from src/main/java/com/cinchapi/ccl/grammar/FunctionTokenSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/condition/FunctionTokenSymbol.java
index 6ea37796..a28f04ad 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/FunctionTokenSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionTokenSymbol.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar;
+package com.cinchapi.ccl.grammar.condition;
 
+import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.type.Function;
 
 /**
diff --git a/src/main/java/com/cinchapi/ccl/grammar/FunctionValueSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionValueSymbol.java
similarity index 92%
rename from src/main/java/com/cinchapi/ccl/grammar/FunctionValueSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/condition/FunctionValueSymbol.java
index 2f8ac2da..981666ee 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/FunctionValueSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionValueSymbol.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar;
+package com.cinchapi.ccl.grammar.condition;
 
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 import com.cinchapi.ccl.type.Function;
 
 /**
diff --git a/src/main/java/com/cinchapi/ccl/grammar/OperatorSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/condition/OperatorSymbol.java
similarity index 92%
rename from src/main/java/com/cinchapi/ccl/grammar/OperatorSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/condition/OperatorSymbol.java
index 7f181e2f..4f385254 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/OperatorSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/condition/OperatorSymbol.java
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar;
+package com.cinchapi.ccl.grammar.condition;
 
+import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
+import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.type.Operator;
 
 /**
diff --git a/src/main/java/com/cinchapi/ccl/grammar/OrderComponentSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/condition/OrderComponentSymbol.java
similarity index 90%
rename from src/main/java/com/cinchapi/ccl/grammar/OrderComponentSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/condition/OrderComponentSymbol.java
index dcefc47f..9b60860e 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/OrderComponentSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/condition/OrderComponentSymbol.java
@@ -13,7 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar;
+package com.cinchapi.ccl.grammar.condition;
+
+import com.cinchapi.ccl.grammar.DirectionSymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
 
 import java.util.Objects;
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/OrderSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/condition/OrderSymbol.java
similarity index 95%
rename from src/main/java/com/cinchapi/ccl/grammar/OrderSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/condition/OrderSymbol.java
index 9652982c..b62743be 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/OrderSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/condition/OrderSymbol.java
@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar;
+package com.cinchapi.ccl.grammar.condition;
 
+import com.cinchapi.ccl.grammar.Symbol;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/com/cinchapi/ccl/grammar/PageSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/condition/PageSymbol.java
similarity index 96%
rename from src/main/java/com/cinchapi/ccl/grammar/PageSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/condition/PageSymbol.java
index 69c68ffe..fabc1478 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/PageSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/condition/PageSymbol.java
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar;
+package com.cinchapi.ccl.grammar.condition;
+
+import com.cinchapi.ccl.grammar.Symbol;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/cinchapi/ccl/syntax/BaseAbstractSyntaxTree.java b/src/main/java/com/cinchapi/ccl/syntax/BaseAbstractSyntaxTree.java
index 5a611c1c..1261ea87 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/BaseAbstractSyntaxTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/BaseAbstractSyntaxTree.java
@@ -23,7 +23,7 @@
  *
  * @author Jeff Nelson
  */
-abstract class BaseAbstractSyntaxTree implements AbstractSyntaxTree {
+public abstract class BaseAbstractSyntaxTree implements AbstractSyntaxTree {
 
     @Override
     public int hashCode() {
diff --git a/src/main/java/com/cinchapi/ccl/syntax/Visitor.java b/src/main/java/com/cinchapi/ccl/syntax/Visitor.java
index 3274f601..91834286 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/Visitor.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/Visitor.java
@@ -15,6 +15,8 @@
  */
 package com.cinchapi.ccl.syntax;
 
+import com.cinchapi.ccl.syntax.condition.*;
+
 /**
  * An implementation of the visitor pattern. This interface should be
  * implemented by any class attempting to visit an {@link AbstractSyntaxTree}.
@@ -23,7 +25,7 @@
  */
 public interface Visitor<T> {
 
-    public T visit(CommandTree tree, Object... data);
+    public T visit(QueryTree tree, Object... data);
 
     public default T visit(ConditionTree tree, Object... data) {
         if(tree instanceof ConjunctionTree) {
diff --git a/src/main/java/com/cinchapi/ccl/syntax/command/CommandTree.java b/src/main/java/com/cinchapi/ccl/syntax/command/CommandTree.java
new file mode 100644
index 00000000..8175476e
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/syntax/command/CommandTree.java
@@ -0,0 +1,31 @@
+package com.cinchapi.ccl.syntax.command;
+
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
+
+import java.util.Collection;
+import java.util.Collections;
+
+public abstract class CommandTree extends BaseAbstractSyntaxTree {
+    protected final KeySymbol key;
+    protected final long record;
+
+    public CommandTree(KeySymbol key, long record) {
+        this.key = key;
+        this.record = record;
+    }
+
+    public KeySymbol getKey() {
+        return key;
+    }
+
+    public long getRecord() {
+        return record;
+    }
+
+    @Override
+    public Collection<AbstractSyntaxTree> children() {
+        return Collections.emptyList();
+    }
+}
diff --git a/src/main/java/com/cinchapi/ccl/syntax/AndTree.java b/src/main/java/com/cinchapi/ccl/syntax/condition/AndTree.java
similarity index 91%
rename from src/main/java/com/cinchapi/ccl/syntax/AndTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/condition/AndTree.java
index 9bcfe5da..52ee54de 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/AndTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/condition/AndTree.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax;
+package com.cinchapi.ccl.syntax.condition;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 
 /**
  * An {@link AbstractSyntaxTree} that represents a logical AND.
diff --git a/src/main/java/com/cinchapi/ccl/syntax/ConditionTree.java b/src/main/java/com/cinchapi/ccl/syntax/condition/ConditionTree.java
similarity index 88%
rename from src/main/java/com/cinchapi/ccl/syntax/ConditionTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/condition/ConditionTree.java
index 25e65c63..77cfe774 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/ConditionTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/condition/ConditionTree.java
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax;
+package com.cinchapi.ccl.syntax.condition;
+
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 
 /**
  * An abstraction for a condition node in a {@link AbstractSyntaxTree}
diff --git a/src/main/java/com/cinchapi/ccl/syntax/ConjunctionTree.java b/src/main/java/com/cinchapi/ccl/syntax/condition/ConjunctionTree.java
similarity index 91%
rename from src/main/java/com/cinchapi/ccl/syntax/ConjunctionTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/condition/ConjunctionTree.java
index e50b0438..0714a1de 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/ConjunctionTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/condition/ConjunctionTree.java
@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax;
+package com.cinchapi.ccl.syntax.condition;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.Visitor;
 import com.google.common.collect.Lists;
 
 import java.util.Collection;
diff --git a/src/main/java/com/cinchapi/ccl/syntax/ExpressionTree.java b/src/main/java/com/cinchapi/ccl/syntax/condition/ExpressionTree.java
similarity index 85%
rename from src/main/java/com/cinchapi/ccl/syntax/ExpressionTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/condition/ExpressionTree.java
index 098ade79..9743a57b 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/ExpressionTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/condition/ExpressionTree.java
@@ -13,13 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax;
+package com.cinchapi.ccl.syntax.condition;
 
 import java.util.Collection;
 import java.util.Collections;
 
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.Visitor;
 
 /**
  * An abstraction for an expression node in a {@link AbstractSyntaxTree}
diff --git a/src/main/java/com/cinchapi/ccl/syntax/FunctionTree.java b/src/main/java/com/cinchapi/ccl/syntax/condition/FunctionTree.java
similarity index 76%
rename from src/main/java/com/cinchapi/ccl/syntax/FunctionTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/condition/FunctionTree.java
index ff6ca358..00bd5037 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/FunctionTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/condition/FunctionTree.java
@@ -1,7 +1,10 @@
-package com.cinchapi.ccl.syntax;
+package com.cinchapi.ccl.syntax.condition;
 
-import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.Visitor;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/main/java/com/cinchapi/ccl/syntax/OrTree.java b/src/main/java/com/cinchapi/ccl/syntax/condition/OrTree.java
similarity index 91%
rename from src/main/java/com/cinchapi/ccl/syntax/OrTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/condition/OrTree.java
index 27fb8fd0..e1bb101d 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/OrTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/condition/OrTree.java
@@ -13,9 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax;
+package com.cinchapi.ccl.syntax.condition;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 
 /**
  * An {@link AbstractSyntaxTree} that represents a logical OR.
diff --git a/src/main/java/com/cinchapi/ccl/syntax/OrderTree.java b/src/main/java/com/cinchapi/ccl/syntax/condition/OrderTree.java
similarity index 84%
rename from src/main/java/com/cinchapi/ccl/syntax/OrderTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/condition/OrderTree.java
index e9a14a7c..6e5e2b3f 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/OrderTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/condition/OrderTree.java
@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax;
+package com.cinchapi.ccl.syntax.condition;
 
-import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.Visitor;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/main/java/com/cinchapi/ccl/syntax/PageTree.java b/src/main/java/com/cinchapi/ccl/syntax/condition/PageTree.java
similarity index 84%
rename from src/main/java/com/cinchapi/ccl/syntax/PageTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/condition/PageTree.java
index 5ad35fc0..3d477ac5 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/PageTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/condition/PageTree.java
@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax;
+package com.cinchapi.ccl.syntax.condition;
 
-import com.cinchapi.ccl.grammar.PageSymbol;
+import com.cinchapi.ccl.grammar.condition.PageSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.Visitor;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/src/main/java/com/cinchapi/ccl/syntax/CommandTree.java b/src/main/java/com/cinchapi/ccl/syntax/condition/QueryTree.java
similarity index 83%
rename from src/main/java/com/cinchapi/ccl/syntax/CommandTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/condition/QueryTree.java
index 3df0a62f..aa94ac92 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/CommandTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/condition/QueryTree.java
@@ -13,10 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax;
+package com.cinchapi.ccl.syntax.condition;
 
-import com.cinchapi.ccl.grammar.CommandSymbol;
+import com.cinchapi.ccl.grammar.QuerySymbol;
 import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.Visitor;
 import com.google.common.collect.Lists;
 
 import java.util.Collection;
@@ -28,9 +31,9 @@
  * An abstraction for the overall {@link AbstractSyntaxTree} returned when
  * parsing a command.
  */
-public class CommandTree extends BaseAbstractSyntaxTree {
+public class QueryTree extends BaseAbstractSyntaxTree {
 
-    private CommandSymbol command;
+    private QuerySymbol query;
     private ConditionTree conditionTree;
     private PageTree pageTree;
     private OrderTree orderTree;
@@ -41,9 +44,9 @@ public class CommandTree extends BaseAbstractSyntaxTree {
      * @param conditionTree
      * @param pageTree
      */
-    public CommandTree(ConditionTree conditionTree, PageTree pageTree,
-            OrderTree orderTree) {
-        this.command = CommandSymbol.IMPLICIT;
+    public QueryTree(ConditionTree conditionTree, PageTree pageTree,
+                     OrderTree orderTree) {
+        this.query = QuerySymbol.IMPLICIT;
         this.conditionTree = conditionTree;
         this.pageTree = pageTree;
         this.orderTree = orderTree;
@@ -99,7 +102,7 @@ public Collection<AbstractSyntaxTree> children() {
 
     @Override
     public Symbol root() {
-        return command;
+        return query;
     }
 
     @Override
diff --git a/src/main/java/com/cinchapi/ccl/type/function/KeyCclFunction.java b/src/main/java/com/cinchapi/ccl/type/function/KeyCclFunction.java
index d5a002e2..449d973f 100644
--- a/src/main/java/com/cinchapi/ccl/type/function/KeyCclFunction.java
+++ b/src/main/java/com/cinchapi/ccl/type/function/KeyCclFunction.java
@@ -16,7 +16,7 @@
 package com.cinchapi.ccl.type.function;
 
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
 
 /**
  * A function that is applied to a key across the records that match a condition
diff --git a/src/main/java/com/cinchapi/ccl/type/function/KeyConditionFunction.java b/src/main/java/com/cinchapi/ccl/type/function/KeyConditionFunction.java
index ac7e1b6b..38094109 100644
--- a/src/main/java/com/cinchapi/ccl/type/function/KeyConditionFunction.java
+++ b/src/main/java/com/cinchapi/ccl/type/function/KeyConditionFunction.java
@@ -16,9 +16,9 @@
 package com.cinchapi.ccl.type.function;
 
 import com.cinchapi.ccl.ConditionTreeVisitor;
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ConjunctionTree;
+import com.cinchapi.ccl.syntax.condition.ExpressionTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
 
 /**
  * A function that is applied to a key across the records that match a condition
diff --git a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
index 448a5ad1..5b5afe20 100644
--- a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
+++ b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
@@ -17,30 +17,22 @@
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
 import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
-import com.cinchapi.ccl.grammar.FunctionValueSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.OrderComponentSymbol;
-import com.cinchapi.ccl.grammar.OrderSymbol;
-import com.cinchapi.ccl.grammar.PageSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderSymbol;
+import com.cinchapi.ccl.grammar.condition.PageSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.AndTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
-import com.cinchapi.ccl.syntax.CommandTree;
+import com.cinchapi.ccl.syntax.*;
+import com.cinchapi.ccl.syntax.condition.*;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.type.function.IndexFunction;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
@@ -1586,8 +1578,8 @@ public void testSingleExpressionASTWithPage() {
         AbstractSyntaxTree tree = compiler.parse(ccl);
 
         // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
+        Assert.assertTrue(tree instanceof QueryTree);
+        QueryTree rootNode = (QueryTree) tree;
 
         Assert.assertTrue(rootNode.conditionTree() != null);
         ConditionTree conditionTree = rootNode.conditionTree();
@@ -1599,8 +1591,8 @@ public void testSingleExpressionASTWithPage() {
         Assert.assertEquals("1", expression.values().get(0).toString());
 
         // Page Node
-        Assert.assertTrue(((CommandTree) tree).pageTree() != null);
-        PageSymbol page = (PageSymbol) ((CommandTree) tree).pageTree().root();
+        Assert.assertTrue(((QueryTree) tree).pageTree() != null);
+        PageSymbol page = (PageSymbol) ((QueryTree) tree).pageTree().root();
         Assert.assertEquals(2, page.offset());
         Assert.assertEquals(1, page.limit());
     }
@@ -1969,8 +1961,8 @@ public void testOrderSingleExpressionWithOrderAbstractSyntaxTree() {
         AbstractSyntaxTree tree = compiler.parse(ccl);
 
         // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
+        Assert.assertTrue(tree instanceof QueryTree);
+        QueryTree rootNode = (QueryTree) tree;
 
         Assert.assertTrue(rootNode.conditionTree() != null);
         ConditionTree conditionTree = rootNode.conditionTree();
@@ -1982,8 +1974,8 @@ public void testOrderSingleExpressionWithOrderAbstractSyntaxTree() {
         Assert.assertEquals("1", expression.values().get(0).toString());
 
         // Order Node
-        Assert.assertTrue(((CommandTree) tree).orderTree() != null);
-        OrderSymbol order = (OrderSymbol) ((CommandTree) tree).orderTree()
+        Assert.assertTrue(((QueryTree) tree).orderTree() != null);
+        OrderSymbol order = (OrderSymbol) ((QueryTree) tree).orderTree()
                 .root();
         Assert.assertEquals(order, expectedOrder);
     }
@@ -2002,8 +1994,8 @@ public void testOrderSingleExpressionWithOrderAndPageAbstractSyntaxTree() {
         AbstractSyntaxTree tree = compiler.parse(ccl);
 
         // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
+        Assert.assertTrue(tree instanceof QueryTree);
+        QueryTree rootNode = (QueryTree) tree;
 
         Assert.assertTrue(rootNode.conditionTree() != null);
         ConditionTree conditionTree = rootNode.conditionTree();
@@ -2015,14 +2007,14 @@ public void testOrderSingleExpressionWithOrderAndPageAbstractSyntaxTree() {
         Assert.assertEquals("1", expression.values().get(0).toString());
 
         // Order Node
-        Assert.assertTrue(((CommandTree) tree).orderTree() != null);
-        OrderSymbol order = (OrderSymbol) ((CommandTree) tree).orderTree()
+        Assert.assertTrue(((QueryTree) tree).orderTree() != null);
+        OrderSymbol order = (OrderSymbol) ((QueryTree) tree).orderTree()
                 .root();
         Assert.assertEquals(order, expectedOrder);
 
         // Page Node
-        Assert.assertTrue(((CommandTree) tree).pageTree() != null);
-        PageSymbol page = (PageSymbol) ((CommandTree) tree).pageTree().root();
+        Assert.assertTrue(((QueryTree) tree).pageTree() != null);
+        PageSymbol page = (PageSymbol) ((QueryTree) tree).pageTree().root();
         Assert.assertEquals(2, page.offset());
         Assert.assertEquals(1, page.limit());
     }
diff --git a/src/test/java/com/cinchapi/ccl/CompilerJavaCCTest.java b/src/test/java/com/cinchapi/ccl/CompilerJavaCCTest.java
index 86c1c2a1..ccd80516 100644
--- a/src/test/java/com/cinchapi/ccl/CompilerJavaCCTest.java
+++ b/src/test/java/com/cinchapi/ccl/CompilerJavaCCTest.java
@@ -22,10 +22,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.common.base.Array;
diff --git a/src/test/java/com/cinchapi/ccl/CompilerTest.java b/src/test/java/com/cinchapi/ccl/CompilerTest.java
index 846e167a..bc862232 100644
--- a/src/test/java/com/cinchapi/ccl/CompilerTest.java
+++ b/src/test/java/com/cinchapi/ccl/CompilerTest.java
@@ -20,22 +20,22 @@
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
-import com.cinchapi.ccl.syntax.CommandTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ConjunctionTree;
+import com.cinchapi.ccl.syntax.condition.ExpressionTree;
+import com.cinchapi.ccl.syntax.condition.FunctionTree;
+import com.cinchapi.ccl.syntax.condition.OrderTree;
+import com.cinchapi.ccl.syntax.condition.PageTree;
+import com.cinchapi.ccl.syntax.condition.QueryTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
 import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.OrderComponentSymbol;
-import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.condition.OrderSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
@@ -1310,7 +1310,7 @@ private void doTestAbstractSyntaxTreeGeneration(String ccl) {
 
             @SuppressWarnings("unchecked")
             @Override
-            public Queue<Symbol> visit(CommandTree tree, Object... data) {
+            public Queue<Symbol> visit(QueryTree tree, Object... data) {
                 Queue<Symbol> queue = (Queue<Symbol>) data[0];
                 if(tree.children().size() == 2) {
                     tree.conditionTree().accept(this, data);
diff --git a/src/test/java/com/cinchapi/ccl/GrammarTest.java b/src/test/java/com/cinchapi/ccl/GrammarTest.java
index fd2620d7..e1c15dae 100644
--- a/src/test/java/com/cinchapi/ccl/GrammarTest.java
+++ b/src/test/java/com/cinchapi/ccl/GrammarTest.java
@@ -20,13 +20,13 @@
 import com.cinchapi.ccl.generated.ASTPage;
 import com.cinchapi.ccl.generated.Grammar;
 import com.cinchapi.ccl.generated.GrammarVisitor;
-import com.cinchapi.ccl.syntax.AndTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
+import com.cinchapi.ccl.syntax.condition.AndTree;
+import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.syntax.condition.ExpressionTree;
+import com.cinchapi.ccl.syntax.condition.FunctionTree;
+import com.cinchapi.ccl.syntax.condition.OrTree;
+import com.cinchapi.ccl.syntax.condition.OrderTree;
+import com.cinchapi.ccl.syntax.condition.PageTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.generated.ASTAnd;
 import com.cinchapi.ccl.generated.ASTExpression;
diff --git a/src/test/java/com/cinchapi/ccl/JavaCCParserLogicTest.java b/src/test/java/com/cinchapi/ccl/JavaCCParserLogicTest.java
index a145520a..f8ed8b41 100644
--- a/src/test/java/com/cinchapi/ccl/JavaCCParserLogicTest.java
+++ b/src/test/java/com/cinchapi/ccl/JavaCCParserLogicTest.java
@@ -16,20 +16,20 @@
 package com.cinchapi.ccl;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.FunctionValueSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.AndTree;
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.OrTree;
+import com.cinchapi.ccl.syntax.condition.AndTree;
+import com.cinchapi.ccl.syntax.condition.ConjunctionTree;
+import com.cinchapi.ccl.syntax.condition.ExpressionTree;
+import com.cinchapi.ccl.syntax.condition.OrTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.type.function.IndexFunction;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
diff --git a/src/test/java/com/cinchapi/ccl/JavaCCParserTest.java b/src/test/java/com/cinchapi/ccl/JavaCCParserTest.java
index d0e43652..b4e51d84 100644
--- a/src/test/java/com/cinchapi/ccl/JavaCCParserTest.java
+++ b/src/test/java/com/cinchapi/ccl/JavaCCParserTest.java
@@ -21,8 +21,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.type.Operator;
diff --git a/src/test/java/com/cinchapi/ccl/ParserTest.java b/src/test/java/com/cinchapi/ccl/ParserTest.java
index 62b556bd..0da3634b 100644
--- a/src/test/java/com/cinchapi/ccl/ParserTest.java
+++ b/src/test/java/com/cinchapi/ccl/ParserTest.java
@@ -19,25 +19,25 @@
 import java.util.List;
 import java.util.Queue;
 
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
+import com.cinchapi.ccl.syntax.condition.ConjunctionTree;
+import com.cinchapi.ccl.syntax.condition.ExpressionTree;
+import com.cinchapi.ccl.syntax.condition.FunctionTree;
+import com.cinchapi.ccl.syntax.condition.OrderTree;
+import com.cinchapi.ccl.syntax.condition.PageTree;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.CommandTree;
+import com.cinchapi.ccl.syntax.condition.QueryTree;
 import com.cinchapi.ccl.syntax.Visitor;
 import com.cinchapi.common.reflect.Reflection;
 import com.cinchapi.concourse.Tag;
@@ -1075,7 +1075,7 @@ public Queue<Symbol> visit(ExpressionTree tree, Object... data) {
             }
 
             @Override
-            public Queue<Symbol> visit(CommandTree tree, Object... data) {
+            public Queue<Symbol> visit(QueryTree tree, Object... data) {
                 // TODO Auto-generated method stub
                 return null;
             }
diff --git a/src/test/java/com/cinchapi/ccl/syntax/VisitorTest.java b/src/test/java/com/cinchapi/ccl/syntax/VisitorTest.java
index d840e612..95cdd692 100644
--- a/src/test/java/com/cinchapi/ccl/syntax/VisitorTest.java
+++ b/src/test/java/com/cinchapi/ccl/syntax/VisitorTest.java
@@ -15,12 +15,13 @@
  */
 package com.cinchapi.ccl.syntax;
 
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
+import com.cinchapi.ccl.syntax.condition.*;
 import com.cinchapi.concourse.thrift.Operator;
 import org.junit.Assert;
 import org.junit.Test;
@@ -53,7 +54,7 @@ public void testVisitorPattern() {
         // Test visitor
         Visitor<Object> visitor = new Visitor<Object>() {
             @Override
-            public Object visit(CommandTree tree, Object... data) {
+            public Object visit(QueryTree tree, Object... data) {
                 return data;
             }
 

From 1363a269c6b1fd7149735898e844d6773097c828 Mon Sep 17 00:00:00 2001
From: Javier Lores <lores.javier@gmail.com>
Date: Thu, 23 Jan 2025 08:25:35 -0500
Subject: [PATCH 2/9] Reverted QueryTree name and moved CommandSymbol into
 CommandTree

---
 src/main/java/com/cinchapi/ccl/Compiler.java  |   10 +-
 .../java/com/cinchapi/ccl/CompilerJavaCC.java |   12 +-
 .../cinchapi/ccl/ConditionTreeVisitor.java    |    3 +-
 .../java/com/cinchapi/ccl/JavaCCParser.java   |    2 +-
 src/main/java/com/cinchapi/ccl/Parser.java    |    4 +-
 src/main/java/com/cinchapi/ccl/Parsing.java   |    4 +-
 .../cinchapi/ccl/generated/ASTExpression.java |    4 +-
 .../cinchapi/ccl/generated/ASTFunction.java   |    2 +-
 .../com/cinchapi/ccl/generated/ASTOrder.java  |    2 +-
 .../com/cinchapi/ccl/generated/ASTPage.java   |    2 +-
 .../com/cinchapi/ccl/generated/Grammar.java   |   17 +-
 .../ccl/generated/GrammarTokenManager.java    |   29 -
 .../grammar/{condition => }/Expression.java   |    4 +-
 .../{condition => }/ExpressionSymbol.java     |    3 +-
 .../{condition => }/FunctionKeySymbol.java    |    3 +-
 .../{condition => }/FunctionTokenSymbol.java  |    3 +-
 .../{condition => }/FunctionValueSymbol.java  |    3 +-
 .../{condition => }/OperatorSymbol.java       |    4 +-
 .../{condition => }/OrderComponentSymbol.java |    7 +-
 .../grammar/{condition => }/OrderSymbol.java  |    3 +-
 .../grammar/{condition => }/PageSymbol.java   |    4 +-
 .../com/cinchapi/ccl/grammar/QuerySymbol.java |   25 -
 .../cinchapi/ccl/grammar/TimestampSymbol.java |    1 -
 .../ccl/grammar/command/ImplicitSymbol.java   |   20 +
 .../ccl/syntax/{condition => }/AndTree.java   |    3 +-
 .../QueryTree.java => CommandTree.java}       |   43 +-
 .../syntax/{condition => }/ConditionTree.java |    2 +-
 .../{condition => }/ConjunctionTree.java      |    5 +-
 .../{condition => }/ExpressionTree.java       |    7 +-
 .../syntax/{condition => }/FunctionTree.java  |    4 +-
 .../ccl/syntax/{condition => }/OrTree.java    |    3 +-
 .../ccl/syntax/{condition => }/OrderTree.java |    4 +-
 .../ccl/syntax/{condition => }/PageTree.java  |    4 +-
 .../java/com/cinchapi/ccl/syntax/Visitor.java |    4 +-
 .../ccl/syntax/command/CommandTree.java       |   31 -
 .../ccl/type/function/KeyCclFunction.java     |    2 +-
 .../type/function/KeyConditionFunction.java   |    6 +-
 src/test/all_files.txt                        | 7829 +++++++++++++++++
 .../cinchapi/ccl/CompilerJavaCCLogicTest.java |   45 +-
 .../com/cinchapi/ccl/CompilerJavaCCTest.java  |    6 +-
 .../java/com/cinchapi/ccl/CompilerTest.java   |   24 +-
 .../java/com/cinchapi/ccl/GrammarTest.java    |   14 +-
 .../cinchapi/ccl/JavaCCParserLogicTest.java   |   16 +-
 .../com/cinchapi/ccl/JavaCCParserTest.java    |    4 +-
 .../java/com/cinchapi/ccl/ParserTest.java     |   15 +-
 .../com/cinchapi/ccl/syntax/VisitorTest.java  |    7 +-
 46 files changed, 7990 insertions(+), 259 deletions(-)
 rename src/main/java/com/cinchapi/ccl/grammar/{condition => }/Expression.java (97%)
 rename src/main/java/com/cinchapi/ccl/grammar/{condition => }/ExpressionSymbol.java (98%)
 rename src/main/java/com/cinchapi/ccl/grammar/{condition => }/FunctionKeySymbol.java (92%)
 rename src/main/java/com/cinchapi/ccl/grammar/{condition => }/FunctionTokenSymbol.java (91%)
 rename src/main/java/com/cinchapi/ccl/grammar/{condition => }/FunctionValueSymbol.java (92%)
 rename src/main/java/com/cinchapi/ccl/grammar/{condition => }/OperatorSymbol.java (92%)
 rename src/main/java/com/cinchapi/ccl/grammar/{condition => }/OrderComponentSymbol.java (90%)
 rename src/main/java/com/cinchapi/ccl/grammar/{condition => }/OrderSymbol.java (95%)
 rename src/main/java/com/cinchapi/ccl/grammar/{condition => }/PageSymbol.java (96%)
 delete mode 100644 src/main/java/com/cinchapi/ccl/grammar/QuerySymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/ImplicitSymbol.java
 rename src/main/java/com/cinchapi/ccl/syntax/{condition => }/AndTree.java (91%)
 rename src/main/java/com/cinchapi/ccl/syntax/{condition/QueryTree.java => CommandTree.java} (73%)
 rename src/main/java/com/cinchapi/ccl/syntax/{condition => }/ConditionTree.java (94%)
 rename src/main/java/com/cinchapi/ccl/syntax/{condition => }/ConjunctionTree.java (91%)
 rename src/main/java/com/cinchapi/ccl/syntax/{condition => }/ExpressionTree.java (85%)
 rename src/main/java/com/cinchapi/ccl/syntax/{condition => }/FunctionTree.java (90%)
 rename src/main/java/com/cinchapi/ccl/syntax/{condition => }/OrTree.java (91%)
 rename src/main/java/com/cinchapi/ccl/syntax/{condition => }/OrderTree.java (93%)
 rename src/main/java/com/cinchapi/ccl/syntax/{condition => }/PageTree.java (93%)
 delete mode 100644 src/main/java/com/cinchapi/ccl/syntax/command/CommandTree.java
 create mode 100644 src/test/all_files.txt

diff --git a/src/main/java/com/cinchapi/ccl/Compiler.java b/src/main/java/com/cinchapi/ccl/Compiler.java
index 16e75c4b..16458011 100644
--- a/src/main/java/com/cinchapi/ccl/Compiler.java
+++ b/src/main/java/com/cinchapi/ccl/Compiler.java
@@ -22,18 +22,16 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import com.cinchapi.ccl.grammar.QuerySymbol;
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 import com.cinchapi.ccl.syntax.*;
-import com.cinchapi.ccl.syntax.condition.*;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.common.base.Verify;
 import com.cinchapi.common.function.TriFunction;
@@ -268,9 +266,9 @@ public final List<Symbol> tokenize(AbstractSyntaxTree ast) {
 
             @SuppressWarnings("unchecked")
             @Override
-            public List<Symbol> visit(QueryTree tree, Object... data) {
+            public List<Symbol> visit(CommandTree tree, Object... data) {
                 List<Symbol> symbols = (List<Symbol>) data[0];
-                if(tree.root() != QuerySymbol.IMPLICIT) {
+                if(tree.root() != CommandSymbol.IMPLICIT) {
                     symbols.add(tree.root());
                 }
                 for (AbstractSyntaxTree child : tree.children()) {
diff --git a/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java b/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
index bfafb102..5436c4f6 100644
--- a/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
+++ b/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
@@ -30,15 +30,7 @@
 import com.cinchapi.ccl.generated.Grammar;
 import com.cinchapi.ccl.generated.GrammarVisitor;
 import com.cinchapi.ccl.generated.SimpleNode;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.condition.AndTree;
-import com.cinchapi.ccl.syntax.condition.QueryTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
-import com.cinchapi.ccl.syntax.condition.ExpressionTree;
-import com.cinchapi.ccl.syntax.condition.FunctionTree;
-import com.cinchapi.ccl.syntax.condition.OrTree;
-import com.cinchapi.ccl.syntax.condition.OrderTree;
-import com.cinchapi.ccl.syntax.condition.PageTree;
+import com.cinchapi.ccl.syntax.*;
 import com.cinchapi.ccl.type.Operator;
 import com.google.common.collect.Multimap;
 
@@ -117,7 +109,7 @@ else if(functionTree != null && conditionTree == null
                     else {
                         // If the statement has multiple elements, it is
                         // implicitly a command.
-                        return new QueryTree(conditionTree, pageTree,
+                        return new CommandTree(conditionTree, pageTree,
                                 orderTree);
                     }
 
diff --git a/src/main/java/com/cinchapi/ccl/ConditionTreeVisitor.java b/src/main/java/com/cinchapi/ccl/ConditionTreeVisitor.java
index 769ed19c..fe055cac 100644
--- a/src/main/java/com/cinchapi/ccl/ConditionTreeVisitor.java
+++ b/src/main/java/com/cinchapi/ccl/ConditionTreeVisitor.java
@@ -16,7 +16,6 @@
 package com.cinchapi.ccl;
 
 import com.cinchapi.ccl.syntax.*;
-import com.cinchapi.ccl.syntax.condition.*;
 
 /**
  * A {@link Visitor} that can only visit possible subtree types of a
@@ -28,7 +27,7 @@
 public abstract class ConditionTreeVisitor<T> implements Visitor<T> {
 
     @Override
-    public final T visit(QueryTree tree, Object... data) {
+    public final T visit(CommandTree tree, Object... data) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/JavaCCParser.java b/src/main/java/com/cinchapi/ccl/JavaCCParser.java
index b06222a4..35e67739 100644
--- a/src/main/java/com/cinchapi/ccl/JavaCCParser.java
+++ b/src/main/java/com/cinchapi/ccl/JavaCCParser.java
@@ -17,7 +17,7 @@
 
 import com.cinchapi.ccl.generated.Grammar;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
diff --git a/src/main/java/com/cinchapi/ccl/Parser.java b/src/main/java/com/cinchapi/ccl/Parser.java
index e569514d..1f55a03d 100644
--- a/src/main/java/com/cinchapi/ccl/Parser.java
+++ b/src/main/java/com/cinchapi/ccl/Parser.java
@@ -23,11 +23,11 @@
 import javax.annotation.concurrent.Immutable;
 import javax.annotation.concurrent.ThreadSafe;
 
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.common.base.Verify;
 import com.cinchapi.common.function.TriFunction;
diff --git a/src/main/java/com/cinchapi/ccl/Parsing.java b/src/main/java/com/cinchapi/ccl/Parsing.java
index 3e6c35c0..ae37d379 100644
--- a/src/main/java/com/cinchapi/ccl/Parsing.java
+++ b/src/main/java/com/cinchapi/ccl/Parsing.java
@@ -23,9 +23,9 @@
 import java.util.Queue;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTExpression.java b/src/main/java/com/cinchapi/ccl/generated/ASTExpression.java
index 2df2eaec..20a2a3e8 100644
--- a/src/main/java/com/cinchapi/ccl/generated/ASTExpression.java
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTExpression.java
@@ -15,8 +15,8 @@
  */
 package com.cinchapi.ccl.generated;
 
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTFunction.java b/src/main/java/com/cinchapi/ccl/generated/ASTFunction.java
index 05b61dd5..77054ad9 100644
--- a/src/main/java/com/cinchapi/ccl/generated/ASTFunction.java
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTFunction.java
@@ -15,7 +15,7 @@
  */
 package com.cinchapi.ccl.generated;
 
-import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
 
 /**
  * A node that representation a CCL function
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTOrder.java b/src/main/java/com/cinchapi/ccl/generated/ASTOrder.java
index 4256320a..f9261eab 100644
--- a/src/main/java/com/cinchapi/ccl/generated/ASTOrder.java
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTOrder.java
@@ -15,7 +15,7 @@
  */
 package com.cinchapi.ccl.generated;
 
-import com.cinchapi.ccl.grammar.condition.OrderSymbol;
+import com.cinchapi.ccl.grammar.OrderSymbol;
 
 /**
  * A node that representation a CCL Order
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTPage.java b/src/main/java/com/cinchapi/ccl/generated/ASTPage.java
index 6ba991e5..53315c00 100644
--- a/src/main/java/com/cinchapi/ccl/generated/ASTPage.java
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTPage.java
@@ -15,7 +15,7 @@
  */
 package com.cinchapi.ccl.generated;
 
-import com.cinchapi.ccl.grammar.condition.PageSymbol;
+import com.cinchapi.ccl.grammar.PageSymbol;
 
 /**
  * A node that representation a Page
diff --git a/src/main/java/com/cinchapi/ccl/generated/Grammar.java b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
index ba0e7bf4..36180cd8 100644
--- a/src/main/java/com/cinchapi/ccl/generated/Grammar.java
+++ b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
@@ -4,25 +4,24 @@
 
 import com.cinchapi.ccl.SyntaxException;
 import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
 import com.cinchapi.ccl.type.function.KeyRecordsFunction;
-import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.FunctionValueSymbol;
 import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
 import com.cinchapi.ccl.type.function.IndexFunction;
 import com.cinchapi.ccl.grammar.NavigationKeySymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OrderComponentSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.condition.PageSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderSymbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.grammar.PageSymbol;
+import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.syntax.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.util.NaturalLanguage;
 import com.cinchapi.common.base.AnyStrings;
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
index a437c6ff..eae83ec6 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
@@ -1,36 +1,7 @@
 /* GrammarTokenManager.java */
 /* Generated By:JJTree&JavaCC: Do not edit this line. GrammarTokenManager.java */
 package com.cinchapi.ccl.generated;
-import com.cinchapi.ccl.SyntaxException;
-import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.ValueTokenSymbol;
-import com.cinchapi.ccl.type.function.KeyConditionFunction;
-import com.cinchapi.ccl.type.function.KeyRecordsFunction;
-import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
-import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
-import com.cinchapi.ccl.type.function.IndexFunction;
-import com.cinchapi.ccl.grammar.NavigationKeySymbol;
-import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
-import com.cinchapi.ccl.grammar.TimestampSymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.condition.PageSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderSymbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
-import com.cinchapi.ccl.type.Operator;
-import com.cinchapi.ccl.util.NaturalLanguage;
 import com.cinchapi.common.base.AnyStrings;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.function.Function;
 
 /** Token Manager. */
 public class GrammarTokenManager implements GrammarConstants {
diff --git a/src/main/java/com/cinchapi/ccl/grammar/condition/Expression.java b/src/main/java/com/cinchapi/ccl/grammar/Expression.java
similarity index 97%
rename from src/main/java/com/cinchapi/ccl/grammar/condition/Expression.java
rename to src/main/java/com/cinchapi/ccl/grammar/Expression.java
index daacb6b2..0728bcc0 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/condition/Expression.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/Expression.java
@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar.condition;
-
-import com.cinchapi.ccl.grammar.*;
+package com.cinchapi.ccl.grammar;
 
 import java.util.List;
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/condition/ExpressionSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/ExpressionSymbol.java
similarity index 98%
rename from src/main/java/com/cinchapi/ccl/grammar/condition/ExpressionSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/ExpressionSymbol.java
index 9d55abd2..274ba6d2 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/condition/ExpressionSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/ExpressionSymbol.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar.condition;
+package com.cinchapi.ccl.grammar;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.cinchapi.ccl.generated.ASTExpression;
-import com.cinchapi.ccl.grammar.*;
 import com.cinchapi.ccl.type.Operator;
 
 /**
diff --git a/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionKeySymbol.java b/src/main/java/com/cinchapi/ccl/grammar/FunctionKeySymbol.java
similarity index 92%
rename from src/main/java/com/cinchapi/ccl/grammar/condition/FunctionKeySymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/FunctionKeySymbol.java
index 5e48323e..57ff5091 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionKeySymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/FunctionKeySymbol.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar.condition;
+package com.cinchapi.ccl.grammar;
 
-import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.type.Function;
 
 /**
diff --git a/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionTokenSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/FunctionTokenSymbol.java
similarity index 91%
rename from src/main/java/com/cinchapi/ccl/grammar/condition/FunctionTokenSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/FunctionTokenSymbol.java
index a28f04ad..6ea37796 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionTokenSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/FunctionTokenSymbol.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar.condition;
+package com.cinchapi.ccl.grammar;
 
-import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.type.Function;
 
 /**
diff --git a/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionValueSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/FunctionValueSymbol.java
similarity index 92%
rename from src/main/java/com/cinchapi/ccl/grammar/condition/FunctionValueSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/FunctionValueSymbol.java
index 981666ee..2f8ac2da 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/condition/FunctionValueSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/FunctionValueSymbol.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar.condition;
+package com.cinchapi.ccl.grammar;
 
-import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 import com.cinchapi.ccl.type.Function;
 
 /**
diff --git a/src/main/java/com/cinchapi/ccl/grammar/condition/OperatorSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/OperatorSymbol.java
similarity index 92%
rename from src/main/java/com/cinchapi/ccl/grammar/condition/OperatorSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/OperatorSymbol.java
index 4f385254..7f181e2f 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/condition/OperatorSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/OperatorSymbol.java
@@ -13,10 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar.condition;
+package com.cinchapi.ccl.grammar;
 
-import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
-import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.type.Operator;
 
 /**
diff --git a/src/main/java/com/cinchapi/ccl/grammar/condition/OrderComponentSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/OrderComponentSymbol.java
similarity index 90%
rename from src/main/java/com/cinchapi/ccl/grammar/condition/OrderComponentSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/OrderComponentSymbol.java
index 9b60860e..dcefc47f 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/condition/OrderComponentSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/OrderComponentSymbol.java
@@ -13,12 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar.condition;
-
-import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.Symbol;
-import com.cinchapi.ccl.grammar.TimestampSymbol;
+package com.cinchapi.ccl.grammar;
 
 import java.util.Objects;
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/condition/OrderSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/OrderSymbol.java
similarity index 95%
rename from src/main/java/com/cinchapi/ccl/grammar/condition/OrderSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/OrderSymbol.java
index b62743be..9652982c 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/condition/OrderSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/OrderSymbol.java
@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar.condition;
+package com.cinchapi.ccl.grammar;
 
-import com.cinchapi.ccl.grammar.Symbol;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/com/cinchapi/ccl/grammar/condition/PageSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/PageSymbol.java
similarity index 96%
rename from src/main/java/com/cinchapi/ccl/grammar/condition/PageSymbol.java
rename to src/main/java/com/cinchapi/ccl/grammar/PageSymbol.java
index fabc1478..69c68ffe 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/condition/PageSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/PageSymbol.java
@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.grammar.condition;
-
-import com.cinchapi.ccl.grammar.Symbol;
+package com.cinchapi.ccl.grammar;
 
 import javax.annotation.Nullable;
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/QuerySymbol.java b/src/main/java/com/cinchapi/ccl/grammar/QuerySymbol.java
deleted file mode 100644
index f14c4a34..00000000
--- a/src/main/java/com/cinchapi/ccl/grammar/QuerySymbol.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2013-2020 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl.grammar;
-
-/**
- * A {@link Symbol} that represents a "query".
- *
- * @author Jeff Nelson
- */
-public enum QuerySymbol implements Symbol {
-    IMPLICIT
-}
diff --git a/src/main/java/com/cinchapi/ccl/grammar/TimestampSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/TimestampSymbol.java
index 21824678..6402dab8 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/TimestampSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/TimestampSymbol.java
@@ -17,7 +17,6 @@
 
 import java.util.concurrent.TimeUnit;
 
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
 import com.cinchapi.common.base.AnyStrings;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.primitives.Longs;
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/ImplicitSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/ImplicitSymbol.java
new file mode 100644
index 00000000..329154b1
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/ImplicitSymbol.java
@@ -0,0 +1,20 @@
+package com.cinchapi.ccl.grammar.command;
+
+/**
+ * A {@link CommandSymbol} that represents an IMPLICIT command
+ */
+public class ImplicitSymbol implements CommandSymbol{
+    /**
+     * Singleton instance.
+     */
+    public static final ImplicitSymbol INSTANCE = new ImplicitSymbol();
+
+    private ImplicitSymbol() {
+        // Use INSTANCE
+    }
+
+    @Override
+    public String type() {
+        return "IMPLICIT";
+    }
+}
diff --git a/src/main/java/com/cinchapi/ccl/syntax/condition/AndTree.java b/src/main/java/com/cinchapi/ccl/syntax/AndTree.java
similarity index 91%
rename from src/main/java/com/cinchapi/ccl/syntax/condition/AndTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/AndTree.java
index 52ee54de..9bcfe5da 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/condition/AndTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/AndTree.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax.condition;
+package com.cinchapi.ccl.syntax;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 
 /**
  * An {@link AbstractSyntaxTree} that represents a logical AND.
diff --git a/src/main/java/com/cinchapi/ccl/syntax/condition/QueryTree.java b/src/main/java/com/cinchapi/ccl/syntax/CommandTree.java
similarity index 73%
rename from src/main/java/com/cinchapi/ccl/syntax/condition/QueryTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/CommandTree.java
index aa94ac92..42db4dfa 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/condition/QueryTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/CommandTree.java
@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax.condition;
+package com.cinchapi.ccl.syntax;
 
-import com.cinchapi.ccl.grammar.QuerySymbol;
 import com.cinchapi.ccl.grammar.Symbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.Visitor;
+import com.cinchapi.ccl.grammar.command.CommandSymbol;
+import com.cinchapi.ccl.grammar.command.ImplicitSymbol;
 import com.google.common.collect.Lists;
 
 import java.util.Collection;
@@ -31,9 +29,9 @@
  * An abstraction for the overall {@link AbstractSyntaxTree} returned when
  * parsing a command.
  */
-public class QueryTree extends BaseAbstractSyntaxTree {
+public class CommandTree extends BaseAbstractSyntaxTree {
 
-    private QuerySymbol query;
+    private CommandSymbol command;
     private ConditionTree conditionTree;
     private PageTree pageTree;
     private OrderTree orderTree;
@@ -41,12 +39,29 @@ public class QueryTree extends BaseAbstractSyntaxTree {
     /**
      * Construct a new instance.
      *
+     * @param command
      * @param conditionTree
      * @param pageTree
+     * @param orderTree
      */
-    public QueryTree(ConditionTree conditionTree, PageTree pageTree,
-                     OrderTree orderTree) {
-        this.query = QuerySymbol.IMPLICIT;
+    public CommandTree(CommandSymbol command, ConditionTree conditionTree, PageTree pageTree,
+                       OrderTree orderTree) {
+        this.command = command;
+        this.conditionTree = conditionTree;
+        this.pageTree = pageTree;
+        this.orderTree = orderTree;
+    }
+
+    /**
+     * Construct a new instance.
+     *
+     * @param conditionTree
+     * @param pageTree
+     * @param orderTree
+     */
+    public CommandTree(ConditionTree conditionTree, PageTree pageTree,
+                       OrderTree orderTree) {
+        this.command = ImplicitSymbol.INSTANCE;
         this.conditionTree = conditionTree;
         this.pageTree = pageTree;
         this.orderTree = orderTree;
@@ -55,7 +70,7 @@ public QueryTree(ConditionTree conditionTree, PageTree pageTree,
     /**
      * Return a {@link ConditonTree tree} for the parsed command's condition, if
      * it exists.
-     * 
+     *
      * @return the {@link ConditionTree}
      */
     @Nullable
@@ -66,7 +81,7 @@ public ConditionTree conditionTree() {
     /**
      * Return a {@link PageTree tree} for the parsed command's page, if it
      * exists.
-     * 
+     *
      * @return the {@link PageTree}
      */
     @Nullable
@@ -102,11 +117,11 @@ public Collection<AbstractSyntaxTree> children() {
 
     @Override
     public Symbol root() {
-        return query;
+        return command;
     }
 
     @Override
     public <T> T accept(Visitor<T> visitor, Object... data) {
         return visitor.visit(this, data);
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/syntax/condition/ConditionTree.java b/src/main/java/com/cinchapi/ccl/syntax/ConditionTree.java
similarity index 94%
rename from src/main/java/com/cinchapi/ccl/syntax/condition/ConditionTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/ConditionTree.java
index 77cfe774..82b14e68 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/condition/ConditionTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/ConditionTree.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax.condition;
+package com.cinchapi.ccl.syntax;
 
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 
diff --git a/src/main/java/com/cinchapi/ccl/syntax/condition/ConjunctionTree.java b/src/main/java/com/cinchapi/ccl/syntax/ConjunctionTree.java
similarity index 91%
rename from src/main/java/com/cinchapi/ccl/syntax/condition/ConjunctionTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/ConjunctionTree.java
index 0714a1de..e50b0438 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/condition/ConjunctionTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/ConjunctionTree.java
@@ -13,13 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax.condition;
+package com.cinchapi.ccl.syntax;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.Visitor;
 import com.google.common.collect.Lists;
 
 import java.util.Collection;
diff --git a/src/main/java/com/cinchapi/ccl/syntax/condition/ExpressionTree.java b/src/main/java/com/cinchapi/ccl/syntax/ExpressionTree.java
similarity index 85%
rename from src/main/java/com/cinchapi/ccl/syntax/condition/ExpressionTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/ExpressionTree.java
index 9743a57b..098ade79 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/condition/ExpressionTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/ExpressionTree.java
@@ -13,16 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax.condition;
+package com.cinchapi.ccl.syntax;
 
 import java.util.Collection;
 import java.util.Collections;
 
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.Visitor;
 
 /**
  * An abstraction for an expression node in a {@link AbstractSyntaxTree}
diff --git a/src/main/java/com/cinchapi/ccl/syntax/condition/FunctionTree.java b/src/main/java/com/cinchapi/ccl/syntax/FunctionTree.java
similarity index 90%
rename from src/main/java/com/cinchapi/ccl/syntax/condition/FunctionTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/FunctionTree.java
index 00bd5037..fb1e56b4 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/condition/FunctionTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/FunctionTree.java
@@ -1,6 +1,6 @@
-package com.cinchapi.ccl.syntax.condition;
+package com.cinchapi.ccl.syntax;
 
-import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
diff --git a/src/main/java/com/cinchapi/ccl/syntax/condition/OrTree.java b/src/main/java/com/cinchapi/ccl/syntax/OrTree.java
similarity index 91%
rename from src/main/java/com/cinchapi/ccl/syntax/condition/OrTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/OrTree.java
index e1bb101d..27fb8fd0 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/condition/OrTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/OrTree.java
@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax.condition;
+package com.cinchapi.ccl.syntax;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 
 /**
  * An {@link AbstractSyntaxTree} that represents a logical OR.
diff --git a/src/main/java/com/cinchapi/ccl/syntax/condition/OrderTree.java b/src/main/java/com/cinchapi/ccl/syntax/OrderTree.java
similarity index 93%
rename from src/main/java/com/cinchapi/ccl/syntax/condition/OrderTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/OrderTree.java
index 6e5e2b3f..d48de884 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/condition/OrderTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/OrderTree.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax.condition;
+package com.cinchapi.ccl.syntax;
 
-import com.cinchapi.ccl.grammar.condition.OrderSymbol;
+import com.cinchapi.ccl.grammar.OrderSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
diff --git a/src/main/java/com/cinchapi/ccl/syntax/condition/PageTree.java b/src/main/java/com/cinchapi/ccl/syntax/PageTree.java
similarity index 93%
rename from src/main/java/com/cinchapi/ccl/syntax/condition/PageTree.java
rename to src/main/java/com/cinchapi/ccl/syntax/PageTree.java
index 3d477ac5..fb46b214 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/condition/PageTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/PageTree.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.cinchapi.ccl.syntax.condition;
+package com.cinchapi.ccl.syntax;
 
-import com.cinchapi.ccl.grammar.condition.PageSymbol;
+import com.cinchapi.ccl.grammar.PageSymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
diff --git a/src/main/java/com/cinchapi/ccl/syntax/Visitor.java b/src/main/java/com/cinchapi/ccl/syntax/Visitor.java
index 91834286..3274f601 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/Visitor.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/Visitor.java
@@ -15,8 +15,6 @@
  */
 package com.cinchapi.ccl.syntax;
 
-import com.cinchapi.ccl.syntax.condition.*;
-
 /**
  * An implementation of the visitor pattern. This interface should be
  * implemented by any class attempting to visit an {@link AbstractSyntaxTree}.
@@ -25,7 +23,7 @@
  */
 public interface Visitor<T> {
 
-    public T visit(QueryTree tree, Object... data);
+    public T visit(CommandTree tree, Object... data);
 
     public default T visit(ConditionTree tree, Object... data) {
         if(tree instanceof ConjunctionTree) {
diff --git a/src/main/java/com/cinchapi/ccl/syntax/command/CommandTree.java b/src/main/java/com/cinchapi/ccl/syntax/command/CommandTree.java
deleted file mode 100644
index 8175476e..00000000
--- a/src/main/java/com/cinchapi/ccl/syntax/command/CommandTree.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.cinchapi.ccl.syntax.command;
-
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.BaseAbstractSyntaxTree;
-
-import java.util.Collection;
-import java.util.Collections;
-
-public abstract class CommandTree extends BaseAbstractSyntaxTree {
-    protected final KeySymbol key;
-    protected final long record;
-
-    public CommandTree(KeySymbol key, long record) {
-        this.key = key;
-        this.record = record;
-    }
-
-    public KeySymbol getKey() {
-        return key;
-    }
-
-    public long getRecord() {
-        return record;
-    }
-
-    @Override
-    public Collection<AbstractSyntaxTree> children() {
-        return Collections.emptyList();
-    }
-}
diff --git a/src/main/java/com/cinchapi/ccl/type/function/KeyCclFunction.java b/src/main/java/com/cinchapi/ccl/type/function/KeyCclFunction.java
index 449d973f..d5a002e2 100644
--- a/src/main/java/com/cinchapi/ccl/type/function/KeyCclFunction.java
+++ b/src/main/java/com/cinchapi/ccl/type/function/KeyCclFunction.java
@@ -16,7 +16,7 @@
 package com.cinchapi.ccl.type.function;
 
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
 
 /**
  * A function that is applied to a key across the records that match a condition
diff --git a/src/main/java/com/cinchapi/ccl/type/function/KeyConditionFunction.java b/src/main/java/com/cinchapi/ccl/type/function/KeyConditionFunction.java
index 38094109..ac7e1b6b 100644
--- a/src/main/java/com/cinchapi/ccl/type/function/KeyConditionFunction.java
+++ b/src/main/java/com/cinchapi/ccl/type/function/KeyConditionFunction.java
@@ -16,9 +16,9 @@
 package com.cinchapi.ccl.type.function;
 
 import com.cinchapi.ccl.ConditionTreeVisitor;
-import com.cinchapi.ccl.syntax.condition.ConjunctionTree;
-import com.cinchapi.ccl.syntax.condition.ExpressionTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.syntax.ConjunctionTree;
+import com.cinchapi.ccl.syntax.ExpressionTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
 
 /**
  * A function that is applied to a key across the records that match a condition
diff --git a/src/test/all_files.txt b/src/test/all_files.txt
new file mode 100644
index 00000000..3ac6f1df
--- /dev/null
+++ b/src/test/all_files.txt
@@ -0,0 +1,7829 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl;
+
+import com.cinchapi.ccl.generated.ASTFunction;
+import com.cinchapi.ccl.generated.ASTOrder;
+import com.cinchapi.ccl.generated.ASTPage;
+import com.cinchapi.ccl.generated.Grammar;
+import com.cinchapi.ccl.generated.GrammarVisitor;
+import com.cinchapi.ccl.syntax.AndTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.ExpressionTree;
+import com.cinchapi.ccl.syntax.FunctionTree;
+import com.cinchapi.ccl.syntax.OrTree;
+import com.cinchapi.ccl.syntax.OrderTree;
+import com.cinchapi.ccl.syntax.PageTree;
+import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.ccl.generated.ASTAnd;
+import com.cinchapi.ccl.generated.ASTExpression;
+import com.cinchapi.ccl.generated.ASTOr;
+import com.cinchapi.ccl.generated.ASTStart;
+import com.cinchapi.ccl.generated.SimpleNode;
+import com.cinchapi.concourse.util.Convert;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Multimap;
+import org.junit.Test;
+
+import com.cinchapi.ccl.generated.ParseException;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
+import java.util.function.Function;
+
+/**
+ * Tests for {@link Grammar}
+ */
+public class GrammarTest {
+
+    @Test
+    public void validUnaryOperatorSingleWordValueExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validUnaryOperatorMultiWordValueExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 2";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validBinaryOperatorExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a >< 1 3";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validImplicitContextFunctionAsEvaluationKey() throws UnsupportedEncodingException, ParseException {
+        String ccl = "friends | avg > 3";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validImplicitIndexFunctionAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "age > avg(age)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validExplicitFunctionWithSingleRecordAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "age > avg(age, 1)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validExplicitFunctionWithBetween() throws UnsupportedEncodingException, ParseException {
+        String ccl = "age bw avg(age) 1000";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validExplicitFunctionWithBetweenCCL() throws UnsupportedEncodingException, ParseException {
+        String ccl = "age bw avg(age, age > 10) 1000";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validExplicitFunctionWithMultipleRecordsAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "age > avg(age, 1, 2)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validExplicitFunctionWithCCLAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "age > avg(age, age < 30)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validImplicitRecordFunctionAsEvaluationKeyAndExplicitFunctionWithCCLAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "age | avg > avg(age, age < 30)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test (expected = ParseException.class)
+    public void missingSecondOperandBinaryOperator() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a >< 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test (expected = ParseException.class)
+    public void tooManyOperandsBinaryOperator() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a >< 1 2 3";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validSingleWordTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 at today";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validJsonReservedIdentifier() throws UnsupportedEncodingException, ParseException {
+        String ccl = "$id$ != 40";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validMultiwordTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 on last christmas";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test (expected = ParseException.class)
+    public void missingTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 at";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validQuotedValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name = \"name\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void singleLeftAndRightQuotation() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name = ‘name’";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validQuotedValueWithQuote() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name = \"wood\\\"ford\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validLocalResolution() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name = $name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, data, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validEscapedLocalResolution() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name = \\$name";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validImplicitLink() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name = @name";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validImplicitEscapedLink() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name = \\@name";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validLink() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a -> 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validConjunctionExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 and b = 2";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validDisjunctionExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 or b = 2";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validParenthesizedExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 or (b = 2 and c = 3)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void operatorEnum() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a LINKS_TO 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validNavigationKeyAsEvaluationKey() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a.b = 3";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validLongNavigationKeyAsEvaluationKey() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a.b.c.d = 3";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validPeriodSeparatedValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = a.b.c";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validRegex() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name nregex (?i:%jeff%)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validLikeWithSecondParenthesizedExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "(a = b) and (name like (?i:%jeff%))";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validLike() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name like (?i:%jeff%)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validSearchMatchWord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "major search_match 'business administration'";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validSearchMatchContains() throws UnsupportedEncodingException, ParseException {
+        String ccl = "major contains 'business administration'";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validSearchMatchOp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "major ~ 'business administration'";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validSearchExcludeWord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name search_exclude jeff at last week";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validSearchExcludeNotContains() throws UnsupportedEncodingException, ParseException {
+        String ccl = "major not_contains 'business administration'";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validSearchExcludeOP() throws UnsupportedEncodingException, ParseException {
+        String ccl = "name !~ jeff at last week";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test (expected = ParseException.class)
+    public void missingKeyExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "= 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test (expected = ParseException.class)
+    public void missingValueExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a =";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test (expected = ParseException.class)
+    public void missingOperatorExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test (expected = ParseException.class)
+    public void missingSecondExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 and";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test (expected = ParseException.class)
+    public void missingFirstExpression() throws UnsupportedEncodingException, ParseException {
+        String ccl = "and a = 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test (expected = ParseException.class)
+    public void invalidLink() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a LINKS_TO b";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testWithNumber() throws UnsupportedEncodingException, ParseException {
+        String input = PAGE + " 3";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream,
+                PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testWithNumberAndSize() throws UnsupportedEncodingException, ParseException {
+        String input = SIZE + " 1 " + PAGE + " 3";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream,
+                PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testWithSize() throws UnsupportedEncodingException, ParseException {
+        String input = SIZE + " 3";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream,
+                PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testWithSizeAndNumber() throws UnsupportedEncodingException, ParseException {
+        String input = SIZE + " 1 " + PAGE + " 3";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream,
+                PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validUnaryOperatorWithPage() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 page 1 size 3";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKey() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " age";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyAscendingSymbol() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " < age";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyAscendingWord() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " age ASC";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyDescendingSymbol() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " > age";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyDescendingWord() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " age DESC";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyWithNumberTimestamp() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " age at " + String.valueOf(122L);
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyWithStringTimestamp() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " age at \"1992-10-02\"";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyWithNumberTimestampAscending() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + "  > age at " + String.valueOf(122L);
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyWithStringTimestampAscending() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " < age at \"1992-10-02\"";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyWithNumberTimestampDescending() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " > age at " + String.valueOf(122L);
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyWithStringTimestampDescending() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " > age at \"1992-10-02\"";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testMultipleKeys() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " age, salary";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testMultipleKeysWithDirectional() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " < age, > salary";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validUnaryOperatorWithOrder() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 " + ORDER + " a";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void validUnaryOperatorWithOrderAndPage() throws UnsupportedEncodingException, ParseException {
+        String ccl = "a = 1 " + ORDER + " a " + SIZE+ " 3 " + PAGE + " 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyMultiRecordsFunction() throws UnsupportedEncodingException, ParseException {
+        String ccl = "avg(age, 1,2,3,5,11)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyMultiRecordsFunctionWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "avg(age, [1,2,3,5,11], at today)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyConditionFunctionWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "avg(age, age > 30, at today)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testIndexFunctionWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "avg(age, at today)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    /**
+     * Constants
+     */
+    private static final String PAGE = "page";
+    private static final String SIZE = "size";
+    private static final String ORDER = "ORDER BY";
+
+    /**
+     * The canonical function to transform strings to java values in a
+     * {@link Parser}.
+     */
+    public final Function<String, Object> PARSER_TRANSFORM_VALUE_FUNCTION = value -> Convert
+            .stringToJava(value);
+
+    /**
+     * The canonical function to transform strings to operators in a
+     * {@link Parser}.
+     */
+    public final Function<String, Operator> PARSER_TRANSFORM_OPERATOR_FUNCTION = operator -> Convert
+            .stringToOperator(operator);
+
+    public final GrammarVisitor visitor = new GrammarVisitor() {
+        @Override
+        public Object visit(SimpleNode node, Object data) {
+            System.out.println(node + ": acceptor not unimplemented in subclass?");
+            data = node.childrenAccept(this, data);
+            return data;
+        }
+
+        @Override
+        public Object visit(ASTStart node, Object data) {
+            data = node.jjtGetChild(0).jjtAccept(this, data);
+            return data;
+        }
+
+        @Override
+        public Object visit(ASTOr node, Object data) {
+            ConditionTree left = (ConditionTree) node.jjtGetChild(0).jjtAccept(this, data);
+            ConditionTree right =(ConditionTree) node.jjtGetChild(1).jjtAccept(this, data);
+            return new OrTree(left, right);
+        }
+
+        @Override
+        public Object visit(ASTAnd node, Object data) {
+            ConditionTree left = (ConditionTree) node.jjtGetChild(0).jjtAccept(this, data);
+            ConditionTree right =(ConditionTree) node.jjtGetChild(1).jjtAccept(this, data);
+            return new AndTree(left, right);
+        }
+
+        @Override
+        public Object visit(ASTExpression node, Object data) {
+            return new ExpressionTree(node);
+        }
+
+        @Override public Object visit(ASTOrder node, Object data) {
+            return new OrderTree(node.order());
+        }
+
+        @Override
+        public Object visit(ASTPage node, Object data) {
+            return new PageTree(node.page());
+        }
+
+        @Override
+        public Object visit(ASTFunction node, Object data) {
+            return new FunctionTree(node.function());
+        }
+    };
+
+}
+/*
+ * Copyright (c) 2013-2020 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl.grammar;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.cinchapi.common.base.AnyStrings;
+import com.cinchapi.concourse.Tag;
+import com.cinchapi.concourse.util.Random;
+
+/**
+ * Unit tests for {@link ValueSymbol}
+ *
+ * @author Jeff Nelson
+ */
+public class ValueSymbolTest {
+    
+    @Test
+    public void testStringWithEqualSignIsQuoted() {
+        String value = Random.getSimpleString()+"="+Random.getSimpleString();
+        System.out.println(value);
+        ValueSymbol symbol = new ValueSymbol(value);
+        Assert.assertTrue(AnyStrings.isWithinQuotes(symbol.toString()));
+    }
+    
+    @Test
+    public void testTagWithEqualSignIsQuoted() {
+        Tag value = Tag.create(Random.getSimpleString()+"="+Random.getSimpleString());
+        System.out.println(value);
+        ValueSymbol symbol = new ValueSymbol(value);
+        Assert.assertTrue(AnyStrings.isWithinQuotes(symbol.toString()));
+    }
+
+}
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl.util;
+
+import org.joda.time.DateTime;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.cinchapi.concourse.Timestamp;
+
+/**
+ * Unit tests for the {@link NaturalLanguage} utils.
+ *
+ * @author Jeff Nelson
+ */
+public class NaturalLanguageTest  {
+
+    @Test
+    public void testParseTimeStringInDefaultFormat() {
+        String str = "Sat Mar 07, 2015 @ 8:11:35:36 PM EST";
+        long expected = Timestamp.parse(str, Timestamp.DEFAULT_FORMATTER)
+                .getMicros();
+        Assert.assertEquals(expected, NaturalLanguage.parseMicros(str));
+    }
+    
+    @Test
+    public void testParseTimeStringFormat1() {
+        String string = "December 30, 1987";
+        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
+        DateTime joda = timestamp.getJoda();
+        Assert.assertEquals(12, joda.getMonthOfYear());
+        Assert.assertEquals(30, joda.getDayOfMonth());
+        Assert.assertEquals(1987, joda.getYear());
+        Assert.assertEquals(0, joda.getHourOfDay());
+        Assert.assertEquals(0, joda.getMinuteOfHour());
+        Assert.assertEquals(0, joda.getSecondOfMinute());
+    }
+    
+    @Test
+    public void testParseTimeStringFormat2() {
+        String string = "Dec 30, 1987";
+        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
+        DateTime joda = timestamp.getJoda();
+        Assert.assertEquals(12, joda.getMonthOfYear());
+        Assert.assertEquals(30, joda.getDayOfMonth());
+        Assert.assertEquals(1987, joda.getYear());
+        Assert.assertEquals(0, joda.getHourOfDay());
+        Assert.assertEquals(0, joda.getMinuteOfHour());
+        Assert.assertEquals(0, joda.getSecondOfMinute());
+    }
+    
+    @Test
+    public void testParseTimeStringFormat3() {
+        String string = "12/30/1987";
+        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
+        DateTime joda = timestamp.getJoda();
+        Assert.assertEquals(12, joda.getMonthOfYear());
+        Assert.assertEquals(30, joda.getDayOfMonth());
+        Assert.assertEquals(1987, joda.getYear());
+        Assert.assertEquals(0, joda.getHourOfDay());
+        Assert.assertEquals(0, joda.getMinuteOfHour());
+        Assert.assertEquals(0, joda.getSecondOfMinute());
+    }
+    
+    @Test
+    public void testParseTimeStringFormat10() {
+        String string = "01-03-1987";
+        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
+        DateTime joda = timestamp.getJoda();
+        Assert.assertEquals(1, joda.getMonthOfYear());
+        Assert.assertEquals(3, joda.getDayOfMonth());
+        Assert.assertEquals(1987, joda.getYear());
+        Assert.assertEquals(0, joda.getHourOfDay());
+        Assert.assertEquals(0, joda.getMinuteOfHour());
+        Assert.assertEquals(0, joda.getSecondOfMinute());
+    }
+    
+    @Test
+    public void testParseTimeStringFormat11() {
+        String string = "1-03-1987";
+        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
+        DateTime joda = timestamp.getJoda();
+        Assert.assertEquals(1, joda.getMonthOfYear());
+        Assert.assertEquals(3, joda.getDayOfMonth());
+        Assert.assertEquals(1987, joda.getYear());
+        Assert.assertEquals(0, joda.getHourOfDay());
+        Assert.assertEquals(0, joda.getMinuteOfHour());
+        Assert.assertEquals(0, joda.getSecondOfMinute());
+    }
+    
+    @Test
+    public void testParseTimeStringFormat12() {
+        String string = "1-3-1987";
+        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
+        DateTime joda = timestamp.getJoda();
+        Assert.assertEquals(1, joda.getMonthOfYear());
+        Assert.assertEquals(3, joda.getDayOfMonth());
+        Assert.assertEquals(1987, joda.getYear());
+        Assert.assertEquals(0, joda.getHourOfDay());
+        Assert.assertEquals(0, joda.getMinuteOfHour());
+        Assert.assertEquals(0, joda.getSecondOfMinute());
+    }
+    
+    @Test
+    public void testParseTimeStringFormat13() {
+        String string = "01-3-1987";
+        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
+        DateTime joda = timestamp.getJoda();
+        Assert.assertEquals(1, joda.getMonthOfYear());
+        Assert.assertEquals(3, joda.getDayOfMonth());
+        Assert.assertEquals(1987, joda.getYear());
+        Assert.assertEquals(0, joda.getHourOfDay());
+        Assert.assertEquals(0, joda.getMinuteOfHour());
+        Assert.assertEquals(0, joda.getSecondOfMinute());
+    }
+
+}/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+
+import com.cinchapi.ccl.syntax.ConjunctionTree;
+import com.cinchapi.ccl.syntax.ExpressionTree;
+import com.cinchapi.ccl.syntax.FunctionTree;
+import com.cinchapi.ccl.syntax.OrderTree;
+import com.cinchapi.ccl.syntax.PageTree;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.cinchapi.ccl.grammar.ConjunctionSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ParenthesisSymbol;
+import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.CommandTree;
+import com.cinchapi.ccl.syntax.Visitor;
+import com.cinchapi.common.reflect.Reflection;
+import com.cinchapi.concourse.Tag;
+import com.cinchapi.concourse.Timestamp;
+import com.cinchapi.concourse.lang.Criteria;
+import com.cinchapi.concourse.thrift.Operator;
+import com.cinchapi.concourse.time.Time;
+import com.cinchapi.concourse.util.Random;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Sets;
+
+/**
+ * Unit tests for {@link Parser} functionality.
+ * 
+ * @author Jeff Nelson
+ * @deprecated Replaced by {@link CompilerTest}
+ */
+@Deprecated
+public abstract class ParserTest {
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationAndGroupOr() {
+        doTestAbstractSyntaxTreeGeneration(
+                "graduation_rate > 90 and (percent_undergrad_black >= 5 or total_cost_out_state > 50000)");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationGroupAndOrGroupAnd() {
+        doTestAbstractSyntaxTreeGeneration(
+                "(graduation_rate > 90 and yield_min = 20) or (percent_undergrad_black >= 5 and total_cost_out_state > 50000)");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationGroupOrAndGroupOr() {
+        doTestAbstractSyntaxTreeGeneration(
+                "(graduation_rate > 90 or yield_min = 20) and (percent_undergrad_black >= 5 or total_cost_out_state > 50000)");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationOrGroupAnd() {
+        doTestAbstractSyntaxTreeGeneration(
+                "graduation_rate > 90 or (percent_undergrad_black >= 5 and total_cost_out_state > 50000)");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationSimpleAndOr() {
+        doTestAbstractSyntaxTreeGeneration(
+                "graduation_rate > 90 AND percent_undergrad_black >= 5 OR total_cost_out_of_state > 50000");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationSimpleOrAnd() {
+        doTestAbstractSyntaxTreeGeneration(
+                "graduation_rate > 90 OR percent_undergrad_black >= 5 AND total_cost_out_of_state > 50000");
+    }
+
+    @Test
+    public void testGroupAnd() {
+        String key0 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
+        Object value0 = Random.getObject();
+        String key1 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
+        Object value1 = Random.getObject();
+        Criteria criteria = Criteria.where().key(key0).operator(operator0)
+                .value(value0).and().key(key1).operator(operator1).value(value1)
+                .build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
+        ConjunctionSymbol sym = (ConjunctionSymbol) symbols.get(1);
+        ExpressionSymbol exp1 = (ExpressionSymbol) symbols.get(2);
+        Assert.assertEquals(3, symbols.size());
+        Assert.assertEquals(exp0.raw().key(), key0);
+        Assert.assertEquals(exp0.raw().operator(), operator0);
+        Assert.assertEquals(exp0.values().get(0).value(), value0);
+        Assert.assertEquals(sym, ConjunctionSymbol.AND);
+        Assert.assertEquals(exp1.raw().key(), key1);
+        Assert.assertEquals(exp1.raw().operator(), operator1);
+        Assert.assertEquals(exp1.values().get(0).value(), value1);
+    }
+
+    @Test
+    public void testGroupOr() {
+        String key0 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
+        Object value0 = Random.getObject();
+        String key1 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
+        Object value1 = Random.getObject();
+        Criteria criteria = Criteria.where().key(key0).operator(operator0)
+                .value(value0).or().key(key1).operator(operator1).value(value1)
+                .build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
+        ConjunctionSymbol sym = (ConjunctionSymbol) symbols.get(1);
+        ExpressionSymbol exp1 = (ExpressionSymbol) symbols.get(2);
+        Assert.assertEquals(3, symbols.size());
+        Assert.assertEquals(exp0.raw().key(), key0);
+        Assert.assertEquals(exp0.raw().operator(), operator0);
+        Assert.assertEquals(exp0.values().get(0).value(), value0);
+        Assert.assertEquals(sym, ConjunctionSymbol.OR);
+        Assert.assertEquals(exp1.raw().key(), key1);
+        Assert.assertEquals(exp1.raw().operator(), operator1);
+        Assert.assertEquals(exp1.values().get(0).value(), value1);
+    }
+
+    @Test
+    public void testGroupSingle() {
+        String key = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator = com.cinchapi.concourse.thrift.Operator.EQUALS;
+        Object value = Random.getObject();
+        Criteria criteria = Criteria.where().key(key).operator(operator)
+                .value(value).build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp = (ExpressionSymbol) symbols.get(0);
+        Assert.assertEquals(1, symbols.size());
+        Assert.assertEquals(exp.raw().key(), key);
+        Assert.assertEquals(exp.raw().operator(), operator);
+        Assert.assertEquals(exp.values().get(0).value(), value);
+    }
+
+    @Test
+    public void testGroupSingleBetween() {
+        String key = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator = com.cinchapi.concourse.thrift.Operator.BETWEEN;
+        Object value = Random.getObject();
+        Object value1 = Random.getObject();
+        Criteria criteria = Criteria.where().key(key).operator(operator)
+                .value(value).value(value1).build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp = (ExpressionSymbol) symbols.get(0);
+        Assert.assertEquals(1, symbols.size());
+        Assert.assertEquals(exp.raw().key(), key);
+        Assert.assertEquals(exp.raw().operator(), operator);
+        Assert.assertEquals(exp.values().get(0).value(), value);
+        Assert.assertEquals(exp.values().get(1).value(), value1);
+    }
+
+    @Test
+    public void testGroupSub() {
+        String key0 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
+        Object value0 = Random.getObject();
+        String key1 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
+        Object value1 = Random.getObject();
+        String key2 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator2 = com.cinchapi.concourse.thrift.Operator.LESS_THAN;
+        Object value2 = Random.getObject();
+        Criteria criteria = Criteria.where().key(key0).operator(operator0)
+                .value(value0).and()
+                .group(Criteria.where().key(key1).operator(operator1)
+                        .value(value1).or().key(key2).operator(operator2)
+                        .value(value2).build())
+                .build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
+        ConjunctionSymbol sym1 = (ConjunctionSymbol) symbols.get(1);
+        ParenthesisSymbol sym2 = (ParenthesisSymbol) symbols.get(2);
+        ExpressionSymbol exp3 = (ExpressionSymbol) symbols.get(3);
+        ConjunctionSymbol sym4 = (ConjunctionSymbol) symbols.get(4);
+        ExpressionSymbol exp5 = (ExpressionSymbol) symbols.get(5);
+        ParenthesisSymbol sym6 = (ParenthesisSymbol) symbols.get(6);
+        Assert.assertEquals(7, symbols.size());
+        Assert.assertEquals(exp0.raw().key(), key0);
+        Assert.assertEquals(exp0.raw().operator(), operator0);
+        Assert.assertEquals(exp0.values().get(0).value(), value0);
+        Assert.assertEquals(ConjunctionSymbol.AND, sym1);
+        Assert.assertEquals(ParenthesisSymbol.LEFT, sym2);
+        Assert.assertEquals(exp3.raw().key(), key1);
+        Assert.assertEquals(exp3.raw().operator(), operator1);
+        Assert.assertEquals(exp3.values().get(0).value(), value1);
+        Assert.assertEquals(ConjunctionSymbol.OR, sym4);
+        Assert.assertEquals(exp5.raw().key(), key2);
+        Assert.assertEquals(exp5.raw().operator(), operator2);
+        Assert.assertEquals(exp5.values().get(0).value(), value2);
+        Assert.assertEquals(ParenthesisSymbol.RIGHT, sym6);
+    }
+
+    @Test(expected = SyntaxException.class)
+    public void testGroupSyntaxException() {
+        List<Symbol> symbols = Lists.<Symbol> newArrayList(new KeySymbol("foo"),
+                new KeySymbol("bar"));
+        Parsing.groupExpressions(symbols);
+    }
+
+    @Test
+    public void testParseCclAndOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value("1").and().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).or().key("c")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(3).build();
+        String ccl = "a = '1' and b = 2 or c = 3";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testParseCclBetween() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value("bar").value("baz").build();
+        String ccl = "where foo bw bar baz";
+        String ccl2 = "where foo >< bar baz";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+        Parser parser2 = createParser(ccl2);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser2.order());
+    }
+
+    @Test
+    public void testParseCclBetweenWithBothReferences() {
+        Criteria criteria = Criteria.where().key("age")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value(30).value(35).build();
+        String ccl = "where age bw $age $retireAge";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("retireAge", 35);
+        data.put("team", "Cleveland Cavaliers");
+        Parser parser = createParser(ccl, data);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testParseCclBetweenWithFirstReference() {
+        Criteria criteria = Criteria.where().key("age")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value(30).value(100).build();
+        String ccl = "where age bw $age 100";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Parser parser = createParser(ccl, data);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testParseCclBetweenWithSecondReference() {
+        Criteria criteria = Criteria.where().key("age")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value(5).value(30).build();
+        String ccl = "where age bw 5 $age";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Parser parser = createParser(ccl, data);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testParseCCLConjuctionsWithAnd() {
+        String ccl = "name = chandresh pancholi on last christmas day && favovite_player != C. Ronaldo during last year";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        Assert.assertEquals(3, symbols.size());
+        for (int i = 0; i < 2; i++) {
+            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+            Assert.assertTrue(
+                    expr.values().get(0).value().toString().contains(" "));
+            Assert.assertNotEquals(0, expr.raw().timestamp());
+        }
+    }
+
+    @Test
+    public void testParseCclGroupOrAndGroupOr() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .and()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 or b = 2) AND (c = 3 or d = 4)";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testParseCclGroupOrAndGroupOrConjuctions() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .and()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 || b = 2) && (c = 3 || d = 4)";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+
+    }
+
+    @Test
+    public void testParseCclGroupOrAndGroupOrConjuctionsWithSingleAmpersand() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .and()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 || b = 2) & (c = 3 || d = 4)";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testParseCclGroupOrOrConjuction() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .or()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 || b = 2) || (c = 3 || d = 4)";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testParseCclGroupOrOrGroupOr() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .or()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 or b = 2) or (c = 3 or d = 4)";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test(expected = SyntaxException.class)
+    public void testParseCclInvalidReference() {
+        String ccl = "name = $name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("name", "King James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Parser parser = createParser(ccl, data);
+        Parsing.toPostfixNotation(parser.tokenize());
+    }
+
+    @Test
+    public void testParseCclLocalReferences() {
+        Criteria criteria = Criteria.where().key("name")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value("Lebron James").build();
+        String ccl = "name = $name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Parser parser = createParser(ccl, data);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testParseCclNoSpaces() {
+        String ccl = "name=jeff";
+        Parser parser = createParser(ccl);
+        parser.order();
+    }
+
+    @Test(expected = SyntaxException.class)
+    public void testParseCclReferenceNotFound() {
+        String ccl = "name = $name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Parser parser = createParser(ccl, data);
+        Parsing.toPostfixNotation(parser.tokenize());
+    }
+
+    @Test
+    public void testParseCclSimple() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value("bar").build();
+        String ccl = "where foo = bar";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+
+    }
+
+    @Test
+    public void testParseCclSimpleAnd() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).build();
+        String ccl = "a = 1 and b = 2";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testParseCclSimpleOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).or().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).build();
+        String ccl = "a = 1 or b = 2";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testParseCclTimestampBasicPhrase() {
+        String ccl = "name = jeff at \"now\"";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclTimestampComplexPhrase() {
+        String ccl = "name = jeff at \"last christmas\"";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclTimestampNumericPhrase() {
+        String ccl = "name = jeff at \"" + Time.now() + "\"";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclTimestampPhraseWithoutQuotes() {
+        String ccl = "name = jeff at 3 seconds ago";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclValueAndTimestampPhraseWithoutQuotes() {
+        String ccl = "name = jeff nelson on last christmas day";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertEquals("jeff nelson", expr.values().get(0).value());
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclValueAndTimestampPhraseWithoutQuotesAnd() {
+        String ccl = "name = jeff nelson on last christmas day and favorite_player != Lebron James during last week";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        Assert.assertEquals(3, symbols.size());
+        for (int i = 0; i < 2; ++i) {
+            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+            Assert.assertTrue(
+                    expr.values().get(0).value().toString().contains(" "));
+            Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                               // timestamp was
+                                                               // parsed
+        }
+    }
+
+    @Test
+    public void testParseCclValueWithoutQuotes() {
+        String ccl = "name = jeff nelson";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertEquals("jeff nelson", expr.values().get(0).value());
+    }
+
+    @Test
+    public void testParseCclValueWithoutQuotesAnd() {
+        String ccl = "name = jeff nelson and favorite_player != Lebron James";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        Assert.assertEquals(3, symbols.size());
+        for (int i = 0; i < 2; ++i) {
+            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+            Assert.assertTrue(
+                    expr.values().get(0).value().toString().contains(" "));
+        }
+    }
+
+    @Test
+    public void testParserAnalysisIncludesAllCriteriaKeys() {
+        String ccl = "name = jeff and age = 100 and company = cinchapi or company = blavity";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(Sets.newHashSet("name", "age", "company"),
+                parser.analyze().keys());;
+    }
+
+    @Test
+    public void testPostfixNotationAndGroupOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and()
+                .group(Criteria.where().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).or().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).build())
+                .build();
+        String ccl = "a = 1 and (b = 2 or c = 3)";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                parser.order());
+    }
+
+    @Test
+    public void testReproGH_113() {
+        String ccl = "location = \"Atlanta (HQ)\"";
+        Parser parser = createParser(ccl);
+        Queue<PostfixNotationSymbol> symbols = parser.order();
+        Assert.assertEquals(1, symbols.size());
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertEquals("Atlanta (HQ)", expr.raw().values().get(0));
+    }
+
+    @Test
+    public void testToPostfixNotationAndGroupOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and()
+                .group(Criteria.where().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).or().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).build())
+                .build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 2)),
+                ExpressionSymbol.create(new KeySymbol("c"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(3)));
+        Assert.assertEquals(Iterables.get(pfn, 3), ConjunctionSymbol.OR);
+        Assert.assertEquals(Iterables.get(pfn, 4), ConjunctionSymbol.AND);
+
+    }
+
+    @Test
+    public void testToPostfixNotationAndOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).or().key("c")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(3).build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 5);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.AND);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
+                ExpressionSymbol.create(new KeySymbol("c"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(3)));
+        Assert.assertEquals(Iterables.get(pfn, 4), ConjunctionSymbol.OR);
+    }
+
+    @Test
+    public void testToPostfixNotationGroupOrAndGroupOr() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .and()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
+                ExpressionSymbol.create(new KeySymbol("c"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(3)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 4)),
+                ExpressionSymbol.create(new KeySymbol("d"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(4)));
+        Assert.assertEquals(Iterables.get(pfn, 5), ConjunctionSymbol.OR);
+        Assert.assertEquals(Iterables.get(pfn, 6), ConjunctionSymbol.AND);
+
+    }
+
+    @Test
+    public void testToPostfixNotationGroupOrOrGroupOr() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .or()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
+                ExpressionSymbol.create(new KeySymbol("c"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(3)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 4)),
+                ExpressionSymbol.create(new KeySymbol("d"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(4)));
+        Assert.assertEquals(Iterables.get(pfn, 5), ConjunctionSymbol.OR);
+        Assert.assertEquals(Iterables.get(pfn, 6), ConjunctionSymbol.OR);
+
+    }
+
+    @Test
+    public void testToPostfixNotationSimple() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value("bar").build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 1);
+        Assert.assertEquals(
+                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).key(),
+                new KeySymbol("foo"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
+                .values().get(0), new ValueSymbol("bar"));
+        Assert.assertEquals(
+                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).operator(),
+                new OperatorSymbol(
+                        com.cinchapi.concourse.thrift.Operator.EQUALS));
+    }
+
+    @Test
+    public void testToPostfixNotationSimpleAnd() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 3);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.AND);
+    }
+
+    @Test
+    public void testToPostfixNotationSimpleBetween() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value("bar").value("baz").build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 1);
+        Assert.assertEquals(
+                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).key(),
+                new KeySymbol("foo"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
+                .values().get(0), new ValueSymbol("bar"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
+                .values().get(1), new ValueSymbol("baz"));
+        Assert.assertEquals(
+                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).operator(),
+                new OperatorSymbol(
+                        com.cinchapi.concourse.thrift.Operator.BETWEEN));
+    }
+
+    @Test
+    public void testToPostfixNotationSimpleOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).or().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 3);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
+    }
+
+    @Test
+    public void testAnalyzeKeysOperator() {
+        String ccl = "name = jeff AND company = Cinchapi and age > 20 or name != bob";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(Sets.newHashSet("name", "company"),
+                parser.analyze().keys(Operator.EQUALS));
+    }
+
+    @Test
+    public void testAnalyzeOperators() {
+        String ccl = "name = jeff AND company = Cinchapi and age > 20 or name != bob";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(Sets.newHashSet(Operator.EQUALS,
+                Operator.GREATER_THAN, Operator.NOT_EQUALS),
+                parser.analyze().operators());
+    }
+
+    @Test
+    public void testConjunctionPrecedence() {
+        String ccl = "name = jeff OR name = bob AND age > 100";
+        Parser parser = createParser(ccl);
+        AbstractSyntaxTree ast = parser.parse();
+        Assert.assertEquals(ConjunctionSymbol.OR, ast.root());
+    }
+
+    @Test
+    public void testParseLinksTo() {
+        String ccl1 = "friend lnk2 1";
+        String ccl2 = "friend lnks2 1";
+        String ccl3 = "friend -> 1";
+        Parser parser1 = createParser(ccl1);
+        Parser parser2 = createParser(ccl2);
+        Parser parser3 = createParser(ccl3);
+        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO),
+                parser1.analyze().operators());
+        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO),
+                parser2.analyze().operators());
+        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO),
+                parser3.analyze().operators());
+    }
+
+    @Test
+    public void testParseLikeOperator() {
+        String ccl = "email like %gmail%";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals(Sets.newHashSet(Operator.LIKE),
+                parser.analyze().operators());
+    }
+
+    @Test
+    public void testTokenizeUnquotedValueStringWithSpace() {
+        Criteria criteria = Criteria.where().key("name")
+                .operator(Operator.EQUALS).value("Jeff Nelson").and()
+                .group(Criteria.where().key("company").operator(Operator.EQUALS)
+                        .value("Cinchapi").or().key("company")
+                        .operator(Operator.EQUALS).value("Blavity"))
+                .build();
+        String ccl = criteria.ccl();
+        Parser parser = createParser(ccl);
+        List<Symbol> symbols = parser.tokenize();
+        Assert.assertEquals(Lists.newArrayList(new KeySymbol("name"),
+                new OperatorSymbol(Operator.EQUALS),
+                new ValueSymbol("Jeff Nelson"), ConjunctionSymbol.AND,
+                ParenthesisSymbol.LEFT, new KeySymbol("company"),
+                new OperatorSymbol(Operator.EQUALS),
+                new ValueSymbol("Cinchapi"), ConjunctionSymbol.OR,
+                new KeySymbol("company"), new OperatorSymbol(Operator.EQUALS),
+                new ValueSymbol("Blavity"), ParenthesisSymbol.RIGHT), symbols);
+    }
+
+    @Test
+    public void testParseSingleQuotedValue() {
+        String ccl = "location = 'Atlanta (HQ)'";
+        Parser parser = createParser(ccl);
+        Assert.assertEquals("Atlanta (HQ)",
+                ((ExpressionSymbol) parser.order().poll()).raw().values()
+                        .get(0));
+    }
+
+    @Test
+    public void testParseNumericString() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.EQUALS).value("17").build();
+        Parser parser = createParser(criteria.ccl());
+        List<Symbol> tokens = parser.tokenize();
+        for (Symbol token : tokens) {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(String.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        }
+    }
+
+    @Test
+    public void testParseNumericTag() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.EQUALS).value(Tag.create("17")).build();
+        Parser parser = createParser(criteria.ccl());
+        List<Symbol> tokens = parser.tokenize();
+        for (Symbol token : tokens) {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(Tag.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        }
+    }
+
+    @Test
+    public void testParseNonNumericTag() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.EQUALS).value(Tag.create("bar")).build();
+        Parser parser = createParser(criteria.ccl());
+        List<Symbol> tokens = parser.tokenize();
+        for (Symbol token : tokens) {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(Tag.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        }
+    }
+
+    @Test
+    public void testParseNumericNumber() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.EQUALS).value(17).build();
+        Parser parser = createParser(criteria.ccl());
+        List<Symbol> tokens = parser.tokenize();
+        for (Symbol token : tokens) {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(Integer.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        }
+    }
+
+    @Test
+    public void testCriteriaWithTimestampValueParse() {
+        Timestamp start = Timestamp.now();
+        Timestamp end = Timestamp.now();
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.BETWEEN).value(start).value(end).build();
+        Parser parser = createParser(criteria.ccl());
+        int count = 0;
+        for (Symbol symbol : parser.tokenize()) {
+            if(symbol instanceof ValueSymbol) {
+                ValueSymbol $symbol = (ValueSymbol) symbol;
+                Assert.assertEquals(Timestamp.class,
+                        $symbol.value().getClass());
+                Assert.assertTrue($symbol.value().equals(start)
+                        || $symbol.value().equals(end));
+                ++count;
+            }
+        }
+        Assert.assertEquals(2, count);
+    }
+
+    protected abstract Parser createParser(String ccl);
+
+    protected abstract Parser createParser(String ccl,
+            Multimap<String, Object> data);
+
+    private void doTestAbstractSyntaxTreeGeneration(String ccl) {
+        Parser parser = createParser(ccl);
+        Visitor<Queue<Symbol>> visitor = new Visitor<Queue<Symbol>>() {
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Queue<Symbol> visit(ConjunctionTree tree, Object... data) {
+                Queue<Symbol> queue = (Queue<Symbol>) data[0];
+                tree.left().accept(this, data);
+                tree.right().accept(this, data);
+                queue.add(tree.root());
+                return queue;
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Queue<Symbol> visit(ExpressionTree tree, Object... data) {
+                Queue<Symbol> queue = (Queue<Symbol>) data[0];
+                queue.add(tree.root());
+                return queue;
+            }
+
+            @Override
+            public Queue<Symbol> visit(CommandTree tree, Object... data) {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            @Override
+            public Queue<Symbol> visit(OrderTree tree, Object... data) {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            @Override
+            public Queue<Symbol> visit(PageTree tree, Object... data) {
+                // TODO Auto-generated method stub
+                return null;
+            }
+
+            @Override
+            public Queue<Symbol> visit(FunctionTree tree,
+                    Object... data) {
+                // TODO Auto-generated method stub
+                return null;
+            }
+        };
+        Queue<Symbol> queue = parser.parse().accept(visitor,
+                new LinkedList<Symbol>());
+        Assert.assertEquals(queue, parser.order());
+    }
+
+}/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl;
+
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.common.base.Array;
+import com.cinchapi.common.function.TriFunction;
+import com.cinchapi.concourse.thrift.TObject;
+import com.cinchapi.concourse.util.Convert;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.Multimap;
+
+/**
+ * {@link CompilerTest} that uses the {@link JavaCCParser}
+ * 
+ * @author Jeff Nelson
+ */
+public class CompilerJavaCCTest extends AbstractCompilerTest {
+
+    @Test
+    public void testParseCclNoSpaces() {
+        String ccl = "name=jeff";
+        Compiler compiler = createCompiler();
+        compiler.arrange((ConditionTree) compiler.parse(ccl));
+
+        Assert.assertEquals(
+                ExpressionSymbol.create(new KeySymbol("name"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol("jeff")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)).peek());
+    }
+
+    @Test
+    public void testLocalEvaluationAnd() {
+        String ccl = "a > 1 AND b bw 10 15";
+        Compiler compiler = createCompiler(Convert::stringToJava,
+                Convert::stringToOperator);
+        Multimap<String, Object> passes = ImmutableMultimap.of("a", 5, "b", 12,
+                "c", 4, "a", -1);
+        TriFunction<Object, Operator, List<Object>, Boolean> evaluator = (value,
+                operator, values) -> {
+            TObject tvalue = Convert.javaToThrift(value);
+            TObject[] tvalues = values.stream().map(Convert::javaToThrift)
+                    .collect(Collectors.toList()).toArray(Array.containing());
+            com.cinchapi.concourse.thrift.Operator toperator = Convert
+                    .stringToOperator(operator.symbol());
+            return tvalue.is(toperator, tvalues);
+        };
+        ConditionTree tree = (ConditionTree) compiler.parse(ccl);
+        Assert.assertTrue(compiler.evaluate(tree, passes, evaluator));
+        Multimap<String, Object> fails = ImmutableMultimap.of("a", 1, "b", 12,
+                "c", 4, "a", -1);
+        Assert.assertFalse(compiler.evaluate(tree, fails, evaluator));
+        Multimap<String, Object> missing = ImmutableMultimap.of("a", 1, "c", 4,
+                "a", -1);
+        Assert.assertFalse(compiler.evaluate(tree, missing, evaluator));
+    }
+
+    @Test
+    public void testLocalEvaluationOr() {
+        String ccl = "a > 1 OR b bw 10 15";
+        Compiler compiler = createCompiler(Convert::stringToJava,
+                Convert::stringToOperator);
+        TriFunction<Object, Operator, List<Object>, Boolean> evaluator = (value,
+                operator, values) -> {
+            TObject tvalue = Convert.javaToThrift(value);
+            TObject[] tvalues = values.stream().map(Convert::javaToThrift)
+                    .collect(Collectors.toList()).toArray(Array.containing());
+            com.cinchapi.concourse.thrift.Operator toperator = Convert
+                    .stringToOperator(operator.symbol());
+            return tvalue.is(toperator, tvalues);
+        };
+        ConditionTree tree = (ConditionTree) compiler.parse(ccl);
+        Multimap<String, Object> a = ImmutableMultimap.of("a", 5, "b", 12, "c",
+                4, "a", -1);
+        Assert.assertTrue(compiler.evaluate(tree, a, evaluator));
+        Multimap<String, Object> b = ImmutableMultimap.of("a", 1, "b", 12, "c",
+                4, "a", -1);
+        Assert.assertTrue(compiler.evaluate(tree, b, evaluator));
+        Multimap<String, Object> c = ImmutableMultimap.of("a", 2, "c", 4, "a",
+                -1);
+        Assert.assertTrue(compiler.evaluate(tree, c, evaluator));
+        Multimap<String, Object> d = ImmutableMultimap.of("a", 1, "c", 4, "a",
+                -1);
+        Assert.assertFalse(compiler.evaluate(tree, d, evaluator));
+    }
+    
+    @Test
+    public void testRegressionV3_1_1A1() {
+        String ccl = "(_ = com.cinchapi.runway.RunwayTest$Adult) AND (email LIKE %email.com%)";
+        Compiler compiler = createCompiler();
+        compiler.parse(ccl);
+        Assert.assertTrue(true); // lack of Exception means the test passes
+    }
+    
+    @Test
+    public void testRegressionV3_1_1A2() {
+        String ccl = "( _ = com.cinchapi.runway.RunwayTest$Adult ) AND ( email LIKE %email.com% )";
+        Compiler compiler = createCompiler();
+        compiler.parse(ccl);
+        Assert.assertTrue(true); // lack of Exception means the test passes
+    }
+
+    @Test
+    public void testRegressionV3_1_1A3() {
+        String ccl = "( _ = com.cinchapi.runway.RunwayTest$Adult ) AND ( a regex b )";
+        Compiler compiler = createCompiler();
+        compiler.parse(ccl);
+        Assert.assertTrue(true); // lack of Exception means the test passes
+    }
+
+    @Override
+    protected Compiler createCompiler(
+            Function<String, Object> valueTransformFunction,
+            Function<String, Operator> operatorTransformFunction) {
+        return Compiler.create(valueTransformFunction,
+                operatorTransformFunction);
+    }
+
+}
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl;
+
+import com.cinchapi.ccl.grammar.ConjunctionSymbol;
+import com.cinchapi.ccl.grammar.DirectionSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.PageSymbol;
+import com.cinchapi.ccl.grammar.ParenthesisSymbol;
+import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.AndTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.ConjunctionTree;
+import com.cinchapi.ccl.syntax.ExpressionTree;
+import com.cinchapi.ccl.syntax.FunctionTree;
+import com.cinchapi.ccl.syntax.OrTree;
+import com.cinchapi.ccl.syntax.OrderTree;
+import com.cinchapi.ccl.syntax.PageTree;
+import com.cinchapi.ccl.syntax.CommandTree;
+import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.ccl.type.function.IndexFunction;
+import com.cinchapi.ccl.type.function.KeyConditionFunction;
+import com.cinchapi.ccl.type.function.KeyRecordsFunction;
+import com.cinchapi.ccl.util.NaturalLanguage;
+import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
+import com.cinchapi.concourse.Tag;
+import com.cinchapi.concourse.lang.Criteria;
+import com.cinchapi.concourse.util.Convert;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+/**
+ * Tests for {@link JavaCCParser}.
+ *
+ * These tests include utput tests (postfix, abstract
+ * syntax tree, tokens)
+ */
+public class CompilerJavaCCLogicTest {
+
+    @Test
+    public void testSingleExpressionTokenize() {
+        String ccl = "a = 1";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleBinaryExpressionTokenize() {
+        String ccl = "a >< 1 3";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("><")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleNRegexExpressionTokenize() {
+        String ccl = "name nregex (?i:%jeff%)";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("name"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("nregex")));
+        expectedTokens.add(new ValueSymbol(
+                COMPILER_PARSE_VALUE_FUNCTION.apply("(?i:%jeff%)")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleLikeExpressionTokenize() {
+        String ccl = "name like (?i:%jeff%)";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("name"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("like")));
+        expectedTokens.add(new ValueSymbol(
+                COMPILER_PARSE_VALUE_FUNCTION.apply("(?i:%jeff%)")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleConjunctionTokenize() {
+        String ccl = "a = 1 and b = 2";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleDisjunctionTokenize() {
+        String ccl = "a = 1 or b = 2";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testDoubleConjunctionTokenize() {
+        String ccl = "a = 1 and b = 2 and c = 3";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testDoubleDisjunctionTokenize() {
+        String ccl = "a = 1 or b = 2 or c = 3";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testConjunctionDisjunctionTokenize() {
+        String ccl = "a = 1 and b = 2 or c = 3";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testDisjunctionConjunctionTokenize() {
+        String ccl = "a = 1 or b = 2 and c = 3";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testDisjunctionParenthesizedConjunctionTokenize() {
+        String ccl = "a = 1 and (b = 2 or c = 3)";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(ParenthesisSymbol.LEFT);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
+        expectedTokens.add(ParenthesisSymbol.RIGHT);
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleConjunctionPostFix() {
+        String ccl = "a = 1 and b = 2";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        ConditionTree tree = (ConditionTree) ast;
+        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testSingleDisjunctionPostFix() {
+        String ccl = "a = 1 or b = 2";
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Queue<PostfixNotationSymbol> order = compiler
+                .arrange((ConditionTree) ast);
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testDoubleConjunctionPostFix() {
+        String ccl = "a = 1 and b = 2 and c = 3";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        ConditionTree tree = (ConditionTree) ast;
+        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testDoubleDisjunctionPostFix() {
+        String ccl = "a = 1 or b = 2 or c = 3";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        ConditionTree tree = (ConditionTree) ast;
+        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testConjunctionDisjunctionPostFix() {
+        String ccl = "a = 1 and b = 2 or c = 3";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        ConditionTree tree = (ConditionTree) ast;
+        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testDisjunctionConjunctionPostFix() {
+        String ccl = "a = 1 or b = 2 and c = 3";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        ConditionTree tree = (ConditionTree) ast;
+        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testDisjunctionParenthesizedConjunctionPostFix() {
+        String ccl = "a = 1 or (b = 2 and c = 3)";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        ConditionTree tree = (ConditionTree) ast;
+        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testSingleExpressionAbstractSyntaxTree() {
+        String ccl = "a = 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("a", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("1", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testSingleBinaryExpressionAbstractSyntaxTree() {
+        String ccl = "a >< 1 2";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("a", expression.key().toString());
+        Assert.assertEquals("><", expression.operator().toString());
+        Assert.assertEquals("1", expression.values().get(0).toString());
+        Assert.assertEquals("2", expression.values().get(1).toString());
+    }
+
+    @Test
+    public void testSingleConjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 and b = 2";
+
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ConjunctionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (((ConjunctionTree) tree)
+                .right()).root();
+        Assert.assertEquals("b", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("2", rightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testSingleDisjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 or b = 2";
+
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof OrTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // Left node
+        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
+                .root();
+        Assert.assertEquals("a", leftExpression.key().toString());
+        Assert.assertEquals("=", leftExpression.operator().toString());
+        Assert.assertEquals("1", leftExpression.values().get(0).toString());
+
+        // Right node
+        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
+                .root();
+        Assert.assertEquals("b", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("2", rightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDoubleConjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 and b = 2 and c = 3";
+
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof AndTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // left node
+        Assert.assertTrue(rootNode.left() instanceof AndTree);
+        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
+
+        // right node
+        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
+                .root();
+        Assert.assertEquals("c", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("3", rightExpression.values().get(0).toString());
+
+        // Left left node
+        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
+                .left()).root();
+        Assert.assertEquals("a", leftLeftExpression.key().toString());
+        Assert.assertEquals("=", leftLeftExpression.operator().toString());
+        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
+
+        // Left right node
+        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightRightExpression = (ExpressionSymbol) (leftNode
+                .right()).root();
+        Assert.assertEquals("b", rightRightExpression.key().toString());
+        Assert.assertEquals("=", rightRightExpression.operator().toString());
+        Assert.assertEquals("2",
+                rightRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDoubleDisjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 or b = 2 or c = 3";
+
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof OrTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // left node
+        Assert.assertTrue(rootNode.left() instanceof OrTree);
+        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
+
+        // right node
+        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
+                .root();
+        Assert.assertEquals("c", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("3", rightExpression.values().get(0).toString());
+
+        // Left left node
+        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
+                .left()).root();
+        Assert.assertEquals("a", leftLeftExpression.key().toString());
+        Assert.assertEquals("=", leftLeftExpression.operator().toString());
+        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
+
+        // Left right node
+        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
+        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (leftNode
+                .right()).root();
+        Assert.assertEquals("b", leftRightExpression.key().toString());
+        Assert.assertEquals("=", leftRightExpression.operator().toString());
+        Assert.assertEquals("2",
+                leftRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testConjunctionDisjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 and b = 2 or c = 3";
+
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof OrTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // left node
+        Assert.assertTrue(rootNode.left() instanceof AndTree);
+        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
+
+        // right node
+        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
+                .root();
+        Assert.assertEquals("c", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("3", rightExpression.values().get(0).toString());
+
+        // Left left node
+        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
+                .left()).root();
+        Assert.assertEquals("a", leftLeftExpression.key().toString());
+        Assert.assertEquals("=", leftLeftExpression.operator().toString());
+        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
+
+        // Left right node
+        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
+        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (leftNode
+                .right()).root();
+        Assert.assertEquals("b", leftRightExpression.key().toString());
+        Assert.assertEquals("=", leftRightExpression.operator().toString());
+        Assert.assertEquals("2",
+                leftRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDisjunctionConjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 or b = 2 and c = 3";
+
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof OrTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // Right node
+        Assert.assertTrue(rootNode.right() instanceof AndTree);
+        ConjunctionTree rightNode = (ConjunctionTree) rootNode.right();
+
+        // right node
+        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
+                .root();
+        Assert.assertEquals("a", leftExpression.key().toString());
+        Assert.assertEquals("=", leftExpression.operator().toString());
+        Assert.assertEquals("1", leftExpression.values().get(0).toString());
+
+        // Right left node
+        Assert.assertTrue(rightNode.left() instanceof ExpressionTree);
+        ExpressionSymbol rightLeftExpression = (ExpressionSymbol) (rightNode
+                .left()).root();
+        Assert.assertEquals("b", rightLeftExpression.key().toString());
+        Assert.assertEquals("=", rightLeftExpression.operator().toString());
+        Assert.assertEquals("2",
+                rightLeftExpression.values().get(0).toString());
+
+        // Right right node
+        Assert.assertTrue(rightNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightRightExpression = (ExpressionSymbol) (rightNode
+                .right()).root();
+        Assert.assertEquals("c", rightRightExpression.key().toString());
+        Assert.assertEquals("=", rightRightExpression.operator().toString());
+        Assert.assertEquals("3",
+                rightRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDisjunctionParenthesizedConjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 and (b = 2 or c = 3)";
+
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(ast instanceof ConditionTree);
+        Assert.assertTrue(ast instanceof AndTree);
+        ConjunctionTree tree = (ConjunctionTree) ast;
+
+        // Left node
+        Assert.assertTrue(tree.left() instanceof ExpressionTree);
+        ExpressionSymbol leftExpression = (ExpressionSymbol) (tree.left())
+                .root();
+        Assert.assertEquals("a", leftExpression.key().toString());
+        Assert.assertEquals("=", leftExpression.operator().toString());
+        Assert.assertEquals("1", leftExpression.values().get(0).toString());
+
+        // Right node
+        Assert.assertTrue(tree.right() instanceof OrTree);
+        ConjunctionTree rightNode = (ConjunctionTree) tree.right();
+
+        // Right left node
+        Assert.assertTrue(rightNode.left() instanceof ExpressionTree);
+        ExpressionSymbol rightLeftExpression = (ExpressionSymbol) (rightNode
+                .left()).root();
+        Assert.assertEquals("b", rightLeftExpression.key().toString());
+        Assert.assertEquals("=", rightLeftExpression.operator().toString());
+        Assert.assertEquals("2",
+                rightLeftExpression.values().get(0).toString());
+
+        // Right right node
+        Assert.assertTrue(rightNode.right() instanceof ExpressionTree);
+        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (rightNode
+                .right()).root();
+        Assert.assertEquals("c", leftRightExpression.key().toString());
+        Assert.assertEquals("=", leftRightExpression.operator().toString());
+        Assert.assertEquals("3",
+                leftRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testParseCclLocalReferences() {
+        String ccl = "name = $name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl, data);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("\"Lebron James\"",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testEscapedCclLocalReferences() {
+        String ccl = "name = \\$name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl, data);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("$name", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDoubleQuotedValue() {
+        String ccl = "name = \"Javier Lores\"";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("\"Javier Lores\"",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDoubleRightAndLeftQuotedValue() {
+        String ccl = "name = “Javier Lores”";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("\"Javier Lores\"",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testQuotedValueWithinQuotedString() {
+        String ccl = "name = \"Javier \\\"Lores\"";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("'Javier \"Lores'",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testNonQuoteEscapedValueWithinQuoteString() {
+        String ccl = "name = \"Javier \\\"\\@Lores\"";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("'Javier \"\\@Lores'",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void validEscapedLocalResolution() {
+        String ccl = "name = \\$name";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("$name", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void validEscapedImplicitLink() {
+        String ccl = "name = \\@name";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("@name", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testValidLink() {
+        String ccl = "name -> 30";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("LINKS_TO", expression.operator().toString());
+        Assert.assertEquals("30", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void validOperatorEnum() {
+        String ccl = "name LINKS_TO 30";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("LINKS_TO", expression.operator().toString());
+        Assert.assertEquals("30", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testNavigationKey() {
+        String ccl = "mother.children = 3";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("mother.children", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("3", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testLongNavigationKey() {
+        String ccl = "mother.mother.siblings = 3";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("mother.mother.siblings",
+                expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("3", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testPeriodSeparatedValue() {
+        String ccl = "mother = a.b.c";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("mother", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("a.b.c", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testImplicitRecordFunctionAsEvaluationKey() {
+        String ccl = "friends | avg > 3";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertTrue(expression.key() instanceof FunctionKeySymbol);
+        FunctionKeySymbol symbol = expression.key();
+        Assert.assertEquals("avg", symbol.key().operation());
+        Assert.assertEquals("friends", symbol.key().key());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertEquals("3", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testImplicitIndexFunctionAsEvaluationValue() {
+        String ccl = "age > avg(age)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((IndexFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((IndexFunction) expression.values().get(0).value()).key());
+    }
+
+    @Test
+    public void testExplicitFunctionWithSingleRecordAsEvaluationValue() {
+        String ccl = "age > avg(age, 1)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((KeyRecordsFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((KeyRecordsFunction) expression.values().get(0).value())
+                        .key());
+        Assert.assertEquals(1, ((List<Long>) ((KeyRecordsFunction) expression
+                .values().get(0).value()).source()).size());
+        Assert.assertEquals((long) 1,
+                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
+                        .get(0).value()).source()).get(0));
+    }
+
+    @Test
+    public void testExplicitFunctionWithBetween() {
+        String ccl = "age bw avg(age) 1000";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals("><", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((IndexFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((IndexFunction) expression.values().get(0).value()).key());
+
+        Assert.assertEquals("1000", expression.values().get(1).toString());
+    }
+
+    @Test
+    public void testExplicitFunctionWithBetweenCCL() {
+        String ccl = "age bw avg(age, age > 10) 1000";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals("><", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .key());
+
+        Assert.assertTrue(
+                (((KeyConditionFunction) expression.values().get(0).value())
+                        .source()) instanceof ExpressionTree);
+        Assert.assertEquals("age",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).key()
+                                .toString());
+        Assert.assertEquals(">",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).operator()
+                                .toString());
+        Assert.assertEquals("10",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).values()
+                                .get(0).toString());
+
+        Assert.assertEquals("1000", expression.values().get(1).toString());
+    }
+
+    @Test
+    public void testExplicitFunctionWithMultipleRecordsAsEvaluationValue() {
+        String ccl = "age > avg(age, 1, 2)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((KeyRecordsFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((KeyRecordsFunction) expression.values().get(0).value())
+                        .key());
+        Assert.assertEquals(2, ((List<Long>) ((KeyRecordsFunction) expression
+                .values().get(0).value()).source()).size());
+        Assert.assertEquals((long) 1,
+                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
+                        .get(0).value()).source()).get(0));
+        Assert.assertEquals((long) 2,
+                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
+                        .get(0).value()).source()).get(1));
+    }
+
+    @Test
+    public void testExplicitFunctionWithCCLAsEvaluationValue() {
+        String ccl = "age > avg(age, age < 30)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .key());
+
+        Assert.assertTrue(
+                (((KeyConditionFunction) expression.values().get(0).value())
+                        .source()) instanceof ExpressionTree);
+        Assert.assertEquals("age",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).key()
+                                .toString());
+        Assert.assertEquals("<",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).operator()
+                                .toString());
+        Assert.assertEquals("30",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).values()
+                                .get(0).toString());
+    }
+
+    @Test
+    public void testValidImplicitRecordFunctionAsEvaluationKeyAndExplicitFunctionWithCCLAsEvaluationValue() {
+        String ccl = "age | avg > avg(age, age < 30)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertTrue(expression.key() instanceof FunctionKeySymbol);
+        Assert.assertEquals("avg",
+                ((ImplicitKeyRecordFunction) expression.key().key())
+                        .operation());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .key());
+
+        Assert.assertTrue(
+                (((KeyConditionFunction) expression.values().get(0).value())
+                        .source()) instanceof ExpressionTree);
+        Assert.assertEquals("age",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).key()
+                                .toString());
+        Assert.assertEquals("<",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).operator()
+                                .toString());
+        Assert.assertEquals("30",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).values()
+                                .get(0).toString());
+    }
+
+    @Test
+    public void testPageWithNumber() {
+        String input = PAGE + " 3";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new PageSymbol(3, null));
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testPageWithNumberAndSize() {
+        String input = SIZE + " 1 " + PAGE + " 3";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new PageSymbol(3, 1));
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testPageWithSize() {
+        String input = SIZE + " 3";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new PageSymbol(null, 3));
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testPageWithSizeAndNumber() {
+        String input = SIZE + " 1 " + PAGE + " 3";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new PageSymbol(3, 1));
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testPageWithSizeAndNumberAST() {
+        String input = SIZE + " 1 " + PAGE + " 3";
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(input);
+
+        // Root node
+        Assert.assertTrue(tree instanceof PageTree);
+
+        PageSymbol page = (PageSymbol) tree.root();
+        Assert.assertEquals(2, page.offset());
+        Assert.assertEquals(1, page.limit());
+    }
+
+    @Test
+    public void testSingleExpressionTokenizeWithPage() {
+        String ccl = "a = 1 " + SIZE + " 3 " + PAGE + " 1 ";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(new PageSymbol(1, 3));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleExpressionASTWithPage() {
+        String ccl = "a = 1 " + SIZE + " 1 " + PAGE + " 3 ";
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+
+        Assert.assertTrue(rootNode.conditionTree() != null);
+        ConditionTree conditionTree = rootNode.conditionTree();
+
+        Assert.assertTrue(conditionTree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) conditionTree.root();
+        Assert.assertEquals("a", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("1", expression.values().get(0).toString());
+
+        // Page Node
+        Assert.assertTrue(((CommandTree) tree).pageTree() != null);
+        PageSymbol page = (PageSymbol) ((CommandTree) tree).pageTree().root();
+        Assert.assertEquals(2, page.offset());
+        Assert.assertEquals(1, page.limit());
+    }
+
+    @Test
+    public void testJsonReservedIdentifier() {
+        String ccl = "$id$ != 40";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("$id$", expression.key().toString());
+        Assert.assertEquals("!=", expression.operator().toString());
+        Assert.assertEquals("40", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testOrderKey() {
+        String input = ORDER + " age";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                DirectionSymbol.ASCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyAscendingSymbol() {
+        String input = ORDER + " < age";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                DirectionSymbol.ASCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyAscendingWord() {
+        String input = ORDER + " age asc";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                DirectionSymbol.ASCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyDescendingSymbol() {
+        String input = ORDER + " > age";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                DirectionSymbol.DESCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyDescendingWord() {
+        String input = ORDER + " age desc";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                DirectionSymbol.DESCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyWithNumberTimestamp() {
+        String input = ORDER + " age at " + String.valueOf(122L);
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                new TimestampSymbol(122L), DirectionSymbol.ASCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyWithStringTimestamp() {
+        String input = ORDER + " age during \"1992-10-02\"";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                new TimestampSymbol(NaturalLanguage.parseMicros("1992-10-02"),
+                        TimeUnit.DAYS),
+                DirectionSymbol.ASCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyWithNumberTimestampAscending() {
+        String input = ORDER + " < age on " + String.valueOf(122L);
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                new TimestampSymbol(122L), DirectionSymbol.ASCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyWithStringTimestampAscending() {
+        String input = ORDER + " < age during \"1992-10-02\"";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                new TimestampSymbol(NaturalLanguage.parseMicros("1992-10-02"),
+                        TimeUnit.DAYS),
+                DirectionSymbol.ASCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyWithNumberTimestampDescending() {
+        String input = ORDER + " > age during " + String.valueOf(122L);
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                new TimestampSymbol(122L), DirectionSymbol.DESCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderKeyWithStringTimestampDescending() {
+        String input = ORDER + " > age in 1992-10-02";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                new TimestampSymbol(NaturalLanguage.parseMicros("1992-10-02"),
+                        TimeUnit.DAYS),
+                DirectionSymbol.DESCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderMultipleKeys() {
+        String input = ORDER + " age, salary";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                DirectionSymbol.ASCENDING));
+        order.add(new OrderComponentSymbol(new KeySymbol("salary"),
+                DirectionSymbol.ASCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderMultipleKeysWithDirectional() {
+        String input = ORDER + " age asc, salary desc";
+
+        // Build expected list
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("age"),
+                DirectionSymbol.ASCENDING));
+        order.add(new OrderComponentSymbol(new KeySymbol("salary"),
+                DirectionSymbol.DESCENDING));
+        expectedTokens.add(order);
+
+        // Generate list
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderMultipleKeysWithDirectionalAST() {
+        String input = ORDER + " < age, > salary";
+
+        OrderSymbol expectedOrder = new OrderSymbol();
+        expectedOrder.add(new OrderComponentSymbol(new KeySymbol("age"),
+                DirectionSymbol.ASCENDING));
+        expectedOrder.add(new OrderComponentSymbol(new KeySymbol("salary"),
+                DirectionSymbol.DESCENDING));
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(input);
+
+        // Root node
+        Assert.assertTrue(ast instanceof OrderTree);
+
+        // Order Node
+        OrderSymbol order = (OrderSymbol) ((OrderTree) ast).root();
+        Assert.assertEquals(order, expectedOrder);
+    }
+
+    @Test
+    public void testOrderSingleExpressionWithOrderTokenize() {
+        String ccl = "a = 1 " + ORDER + " a";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens
+                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
+
+        OrderSymbol order = new OrderSymbol();
+        order.add(new OrderComponentSymbol(new KeySymbol("a"),
+                DirectionSymbol.ASCENDING));
+        expectedTokens.add(order);
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testOrderSingleExpressionWithOrderAbstractSyntaxTree() {
+        String ccl = "a = 1 " + ORDER + " a";
+
+        OrderSymbol expectedOrder = new OrderSymbol();
+        expectedOrder.add(new OrderComponentSymbol(new KeySymbol("a"),
+                DirectionSymbol.ASCENDING));
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+
+        Assert.assertTrue(rootNode.conditionTree() != null);
+        ConditionTree conditionTree = rootNode.conditionTree();
+
+        Assert.assertTrue(conditionTree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) conditionTree.root();
+        Assert.assertEquals("a", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("1", expression.values().get(0).toString());
+
+        // Order Node
+        Assert.assertTrue(((CommandTree) tree).orderTree() != null);
+        OrderSymbol order = (OrderSymbol) ((CommandTree) tree).orderTree()
+                .root();
+        Assert.assertEquals(order, expectedOrder);
+    }
+
+    @Test
+    public void testOrderSingleExpressionWithOrderAndPageAbstractSyntaxTree() {
+        String ccl = "a = 1 " + ORDER + " a " + SIZE + " 1 " + PAGE + " 3";
+
+        OrderSymbol expectedOrder = new OrderSymbol();
+        expectedOrder.add(new OrderComponentSymbol(new KeySymbol("a"),
+                DirectionSymbol.ASCENDING));
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+
+        Assert.assertTrue(rootNode.conditionTree() != null);
+        ConditionTree conditionTree = rootNode.conditionTree();
+
+        Assert.assertTrue(conditionTree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) conditionTree.root();
+        Assert.assertEquals("a", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("1", expression.values().get(0).toString());
+
+        // Order Node
+        Assert.assertTrue(((CommandTree) tree).orderTree() != null);
+        OrderSymbol order = (OrderSymbol) ((CommandTree) tree).orderTree()
+                .root();
+        Assert.assertEquals(order, expectedOrder);
+
+        // Page Node
+        Assert.assertTrue(((CommandTree) tree).pageTree() != null);
+        PageSymbol page = (PageSymbol) ((CommandTree) tree).pageTree().root();
+        Assert.assertEquals(2, page.offset());
+        Assert.assertEquals(1, page.limit());
+    }
+
+    @Test
+    public void testImplicitKeyRecordFunctionTokenize() {
+        String ccl = "age | avg";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new FunctionKeySymbol(
+                new ImplicitKeyRecordFunction("avg", "age")));
+
+        // Generate queue
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testImplicitKeyRecordFunctionAbstractSyntaxTree() {
+        String ccl = "age | avg";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof FunctionTree);
+
+        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
+        Assert.assertEquals("age", symbol.function().key());
+        Assert.assertEquals("avg", symbol.function().operation());
+    }
+
+    @Test
+    public void testIndexFunctionAbstractSyntaxTree() {
+        String ccl = "avg(age)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof FunctionTree);
+
+        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
+        Assert.assertEquals(IndexFunction.class, symbol.function().getClass());
+        Assert.assertEquals("age", symbol.function().key());
+        Assert.assertEquals("avg", symbol.function().operation());
+    }
+
+    @Test
+    public void testKeyCclFunctionAbstractSyntaxTree() {
+        String ccl = "avg(age, age > 3)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof FunctionTree);
+        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
+
+        Assert.assertEquals("avg",
+                ((KeyConditionFunction) symbol.function()).operation());
+        Assert.assertEquals("age",
+                ((KeyConditionFunction) symbol.function()).key());
+
+        Assert.assertTrue((((KeyConditionFunction) symbol.function())
+                .source()) instanceof ExpressionTree);
+        Assert.assertEquals("age",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
+                        .function()).source()).root()).key().toString());
+        Assert.assertEquals(">",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
+                        .function()).source()).root()).operator().toString());
+        Assert.assertEquals("3",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
+                        .function()).source()).root()).values().get(0)
+                                .toString());
+    }
+
+    @Test
+    public void testKeyCclFunctionWithTimestampAbstractSyntaxTree() {
+        String ccl = "avg(age, age > 3, in 1992-10-02)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof FunctionTree);
+        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
+
+        Assert.assertEquals("avg",
+                ((KeyConditionFunction) symbol.function()).operation());
+        Assert.assertEquals("age",
+                ((KeyConditionFunction) symbol.function()).key());
+
+        Assert.assertTrue((((KeyConditionFunction) symbol.function())
+                .source()) instanceof ExpressionTree);
+        Assert.assertEquals("age",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
+                        .function()).source()).root()).key().toString());
+        Assert.assertEquals(">",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
+                        .function()).source()).root()).operator().toString());
+        Assert.assertEquals("3",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
+                        .function()).source()).root()).values().get(0)
+                                .toString());
+        Assert.assertEquals(
+                TimeUnit.DAYS.convert(
+                        ((KeyConditionFunction) symbol.function()).timestamp(),
+                        TimeUnit.MICROSECONDS),
+                TimeUnit.DAYS.convert(NaturalLanguage.parseMicros("1992-10-02"),
+                        TimeUnit.MICROSECONDS));
+    }
+
+    @Test
+    public void testKeyRecordsFunctionAbstractSyntaxTree() {
+        String ccl = "avg(age, 1)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof FunctionTree);
+        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
+
+        Assert.assertEquals("avg",
+                ((KeyRecordsFunction) symbol.function()).operation());
+        Assert.assertEquals("age",
+                ((KeyRecordsFunction) symbol.function()).key());
+
+        Assert.assertEquals(1,
+                ((List<Long>) ((KeyRecordsFunction) symbol.function()).source())
+                        .size());
+        Assert.assertEquals((long) 1,
+                (long) ((List<Long>) ((KeyRecordsFunction) symbol.function())
+                        .source()).get(0));
+    }
+
+    @Test
+    public void testKeyMultiRecordsFunctionAbstractSyntaxTree() {
+        String ccl = "avg(age, 1,2,3,5,11)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof FunctionTree);
+        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
+
+        Assert.assertEquals("avg",
+                ((KeyRecordsFunction) symbol.function()).operation());
+        Assert.assertEquals("age",
+                ((KeyRecordsFunction) symbol.function()).key());
+
+        Assert.assertEquals(5,
+                ((List<Long>) ((KeyRecordsFunction) symbol.function()).source())
+                        .size());
+        Assert.assertEquals((long) 1,
+                (long) ((List<Long>) ((KeyRecordsFunction) symbol.function())
+                        .source()).get(0));
+    }
+
+    @Test
+    public void testKeyMultiRecordsFunctionWithTimestampAbstractSyntaxTree() {
+        String ccl = "avg(age, [1,2,3,5,11], in 1992-10-02)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof FunctionTree);
+        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
+
+        Assert.assertEquals("avg",
+                ((KeyRecordsFunction) symbol.function()).operation());
+        Assert.assertEquals("age",
+                ((KeyRecordsFunction) symbol.function()).key());
+
+        Assert.assertEquals(5,
+                ((List<Long>) ((KeyRecordsFunction) symbol.function()).source())
+                        .size());
+        Assert.assertEquals((long) 1,
+                (long) ((List<Long>) ((KeyRecordsFunction) symbol.function())
+                        .source()).get(0));
+        Assert.assertEquals(
+                TimeUnit.DAYS.convert(
+                        ((KeyRecordsFunction) symbol.function()).timestamp(),
+                        TimeUnit.MICROSECONDS),
+                TimeUnit.DAYS.convert(NaturalLanguage.parseMicros("1992-10-02"),
+                        TimeUnit.MICROSECONDS));
+    }
+
+    @Test
+    public void testIndexFunctionWithTimestampAbstractSyntaxTree() {
+        String ccl = "avg(age, in 1992-10-02)";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof FunctionTree);
+        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
+
+        Assert.assertEquals("avg",
+                ((IndexFunction) symbol.function()).operation());
+        Assert.assertEquals("age", ((IndexFunction) symbol.function()).key());
+
+        Assert.assertEquals(
+                TimeUnit.DAYS.convert(
+                        ((IndexFunction) symbol.function()).timestamp(),
+                        TimeUnit.MICROSECONDS),
+                TimeUnit.DAYS.convert(NaturalLanguage.parseMicros("1992-10-02"),
+                        TimeUnit.MICROSECONDS));
+    }
+
+    @Test
+    public void testReproIX5A() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("_")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value("org.internx.model.data.user.Student"))
+                .and()
+                .group(Criteria.where()
+                        .group(Criteria.where().key("group").operator(
+                                com.cinchapi.concourse.thrift.Operator.LIKE)
+                                .value("%Accounting And Business/management%"))
+                        .or()
+                        .group(Criteria.where().key("major").operator(
+                                com.cinchapi.concourse.thrift.Operator.LIKE)
+                                .value("%accounting and business/management%")));
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(criteria.ccl());
+        List<Symbol> tokens = compiler.tokenize(ast);
+        tokens.forEach(token -> {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(String.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        });
+    }
+
+    @Test
+    public void testReproIX5B() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("_")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(Tag
+                                .create("org.internx.model.data.user.Student")))
+                .and()
+                .group(Criteria.where().group(Criteria.where().key("group")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(Tag
+                                .create("Accounting And Business/management")))
+                        .or()
+                        .group(Criteria.where().key("major").operator(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS)
+                                .value(Tag.create(
+                                        "accounting and business/management"))));
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(criteria.ccl());
+        List<Symbol> tokens = compiler.tokenize(ast);
+        tokens.forEach(token -> {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(Tag.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        });
+    }
+
+    @Test
+    public void testRegressionV3_1_1A() {
+        String ccl = "(a = b) or c = d and (email like email.com)";
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        compiler.parse(ccl);
+        Assert.assertTrue(true); // lack of Exception means the test passes
+    }
+
+    /**
+     * Constants
+     */
+    private static final String PAGE = "page";
+    private static final String SIZE = "size";
+    private static final String ORDER = "order by";
+
+    /**
+     * The canonical function to transform strings to java values in a
+     * {@link Parser}.
+     */
+    public final Function<String, Object> COMPILER_PARSE_VALUE_FUNCTION = value -> Convert
+            .stringToJava(value);
+
+    /**
+     * The canonical function to transform strings to operators in a
+     * {@link Parser}.
+     */
+    public final Function<String, Operator> COMPILER_PARSE_OPERATOR_FUNCTION = operator -> Convert
+            .stringToOperator(operator);
+
+    /**
+     *
+     */
+    @SuppressWarnings("unused")
+    private void printPreOrder(AbstractSyntaxTree tree) {
+        System.out.println(tree.root());
+        for (AbstractSyntaxTree child : tree.children()) {
+            printPreOrder(child);
+        }
+    }
+}
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.concurrent.TimeUnit;
+
+import com.cinchapi.ccl.syntax.ConjunctionTree;
+import com.cinchapi.ccl.syntax.ExpressionTree;
+import com.cinchapi.ccl.syntax.FunctionTree;
+import com.cinchapi.ccl.syntax.OrderTree;
+import com.cinchapi.ccl.syntax.PageTree;
+import com.cinchapi.ccl.syntax.CommandTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.cinchapi.ccl.grammar.ConjunctionSymbol;
+import com.cinchapi.ccl.grammar.DirectionSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.ParenthesisSymbol;
+import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.Visitor;
+import com.cinchapi.ccl.util.NaturalLanguage;
+import com.cinchapi.common.reflect.Reflection;
+import com.cinchapi.concourse.Tag;
+import com.cinchapi.concourse.Timestamp;
+import com.cinchapi.concourse.lang.Criteria;
+import com.cinchapi.concourse.thrift.Operator;
+import com.cinchapi.concourse.time.Time;
+import com.cinchapi.concourse.util.Random;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Sets;
+
+/**
+ * Unit tests for {@link Compiler} functionality.
+ * 
+ * @author Jeff Nelson
+ */
+public abstract class CompilerTest {
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationAndGroupOr() {
+        doTestAbstractSyntaxTreeGeneration(
+                "graduation_rate > 90 and (percent_undergrad_black >= 5 or total_cost_out_state > 50000)");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationGroupAndOrGroupAnd() {
+        doTestAbstractSyntaxTreeGeneration(
+                "(graduation_rate > 90 and yield_min = 20) or (percent_undergrad_black >= 5 and total_cost_out_state > 50000)");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationGroupOrAndGroupOr() {
+        doTestAbstractSyntaxTreeGeneration(
+                "(graduation_rate > 90 or yield_min = 20) and (percent_undergrad_black >= 5 or total_cost_out_state > 50000)");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationOrGroupAnd() {
+        doTestAbstractSyntaxTreeGeneration(
+                "graduation_rate > 90 or (percent_undergrad_black >= 5 and total_cost_out_state > 50000)");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationSimpleAndOr() {
+        doTestAbstractSyntaxTreeGeneration(
+                "graduation_rate > 90 AND percent_undergrad_black >= 5 OR total_cost_out_of_state > 50000");
+    }
+
+    @Test
+    public void testAbstractSyntaxTreeGenerationSimpleOrAnd() {
+        doTestAbstractSyntaxTreeGeneration(
+                "graduation_rate > 90 OR percent_undergrad_black >= 5 AND total_cost_out_of_state > 50000");
+    }
+
+    @Test
+    public void testGroupAnd() {
+        String key0 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
+        Object value0 = Random.getObject();
+        String key1 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
+        Object value1 = Random.getObject();
+        Criteria criteria = Criteria.where().key(key0).operator(operator0)
+                .value(value0).and().key(key1).operator(operator1).value(value1)
+                .build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
+        ConjunctionSymbol sym = (ConjunctionSymbol) symbols.get(1);
+        ExpressionSymbol exp1 = (ExpressionSymbol) symbols.get(2);
+        Assert.assertEquals(3, symbols.size());
+        Assert.assertEquals(exp0.raw().key(), key0);
+        Assert.assertEquals(exp0.raw().operator(), operator0);
+        Assert.assertEquals(exp0.values().get(0).value(), value0);
+        Assert.assertEquals(sym, ConjunctionSymbol.AND);
+        Assert.assertEquals(exp1.raw().key(), key1);
+        Assert.assertEquals(exp1.raw().operator(), operator1);
+        Assert.assertEquals(exp1.values().get(0).value(), value1);
+    }
+
+    @Test
+    public void testGroupOr() {
+        String key0 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
+        Object value0 = Random.getObject();
+        String key1 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
+        Object value1 = Random.getObject();
+        Criteria criteria = Criteria.where().key(key0).operator(operator0)
+                .value(value0).or().key(key1).operator(operator1).value(value1)
+                .build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
+        ConjunctionSymbol sym = (ConjunctionSymbol) symbols.get(1);
+        ExpressionSymbol exp1 = (ExpressionSymbol) symbols.get(2);
+        Assert.assertEquals(3, symbols.size());
+        Assert.assertEquals(exp0.raw().key(), key0);
+        Assert.assertEquals(exp0.raw().operator(), operator0);
+        Assert.assertEquals(exp0.values().get(0).value(), value0);
+        Assert.assertEquals(sym, ConjunctionSymbol.OR);
+        Assert.assertEquals(exp1.raw().key(), key1);
+        Assert.assertEquals(exp1.raw().operator(), operator1);
+        Assert.assertEquals(exp1.values().get(0).value(), value1);
+    }
+
+    @Test
+    public void testGroupSingle() {
+        String key = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator = com.cinchapi.concourse.thrift.Operator.EQUALS;
+        Object value = Random.getObject();
+        Criteria criteria = Criteria.where().key(key).operator(operator)
+                .value(value).build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp = (ExpressionSymbol) symbols.get(0);
+        Assert.assertEquals(1, symbols.size());
+        Assert.assertEquals(exp.raw().key(), key);
+        Assert.assertEquals(exp.raw().operator(), operator);
+        Assert.assertEquals(exp.values().get(0).value(), value);
+    }
+
+    @Test
+    public void testGroupSingleBetween() {
+        String key = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator = com.cinchapi.concourse.thrift.Operator.BETWEEN;
+        Object value = Random.getObject();
+        Object value1 = Random.getObject();
+        Criteria criteria = Criteria.where().key(key).operator(operator)
+                .value(value).value(value1).build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp = (ExpressionSymbol) symbols.get(0);
+        Assert.assertEquals(1, symbols.size());
+        Assert.assertEquals(exp.raw().key(), key);
+        Assert.assertEquals(exp.raw().operator(), operator);
+        Assert.assertEquals(exp.values().get(0).value(), value);
+        Assert.assertEquals(exp.values().get(1).value(), value1);
+    }
+
+    @Test
+    public void testGroupSub() {
+        String key0 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
+        Object value0 = Random.getObject();
+        String key1 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
+        Object value1 = Random.getObject();
+        String key2 = Random.getString();
+        com.cinchapi.concourse.thrift.Operator operator2 = com.cinchapi.concourse.thrift.Operator.LESS_THAN;
+        Object value2 = Random.getObject();
+        Criteria criteria = Criteria.where().key(key0).operator(operator0)
+                .value(value0).and()
+                .group(Criteria.where().key(key1).operator(operator1)
+                        .value(value1).or().key(key2).operator(operator2)
+                        .value(value2).build())
+                .build();
+        List<Symbol> symbols = Parsing
+                .groupExpressions(Reflection.call(criteria, "symbols"));
+        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
+        ConjunctionSymbol sym1 = (ConjunctionSymbol) symbols.get(1);
+        ParenthesisSymbol sym2 = (ParenthesisSymbol) symbols.get(2);
+        ExpressionSymbol exp3 = (ExpressionSymbol) symbols.get(3);
+        ConjunctionSymbol sym4 = (ConjunctionSymbol) symbols.get(4);
+        ExpressionSymbol exp5 = (ExpressionSymbol) symbols.get(5);
+        ParenthesisSymbol sym6 = (ParenthesisSymbol) symbols.get(6);
+        Assert.assertEquals(7, symbols.size());
+        Assert.assertEquals(exp0.raw().key(), key0);
+        Assert.assertEquals(exp0.raw().operator(), operator0);
+        Assert.assertEquals(exp0.values().get(0).value(), value0);
+        Assert.assertEquals(ConjunctionSymbol.AND, sym1);
+        Assert.assertEquals(ParenthesisSymbol.LEFT, sym2);
+        Assert.assertEquals(exp3.raw().key(), key1);
+        Assert.assertEquals(exp3.raw().operator(), operator1);
+        Assert.assertEquals(exp3.values().get(0).value(), value1);
+        Assert.assertEquals(ConjunctionSymbol.OR, sym4);
+        Assert.assertEquals(exp5.raw().key(), key2);
+        Assert.assertEquals(exp5.raw().operator(), operator2);
+        Assert.assertEquals(exp5.values().get(0).value(), value2);
+        Assert.assertEquals(ParenthesisSymbol.RIGHT, sym6);
+    }
+
+    @Test(expected = SyntaxException.class)
+    public void testGroupSyntaxException() {
+        List<Symbol> symbols = Lists.<Symbol> newArrayList(new KeySymbol("foo"),
+                new KeySymbol("bar"));
+        Parsing.groupExpressions(symbols);
+    }
+
+    @Test
+    public void testParseCclAndOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value("1").and().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).or().key("c")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(3).build();
+        String ccl = "a = '1' and b = 2 or c = 3";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+    }
+
+    @Test
+    public void testParseCclBetween() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value("bar").value("baz").build();
+        String ccl = "where foo bw bar baz";
+        String ccl2 = "where foo >< bar baz";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl2)));
+    }
+
+    @Test
+    public void testParseCclBetweenWithBothReferences() {
+        Criteria criteria = Criteria.where().key("age")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value(30).value(35).build();
+        String ccl = "where age bw $age $retireAge";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("retireAge", 35);
+        data.put("team", "Cleveland Cavaliers");
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl, data)));
+    }
+
+    @Test
+    public void testParseCclBetweenWithFirstReference() {
+        Criteria criteria = Criteria.where().key("age")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value(30).value(100).build();
+        String ccl = "where age bw $age 100";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl, data)));
+    }
+
+    @Test
+    public void testParseCclBetweenWithSecondReference() {
+        Criteria criteria = Criteria.where().key("age")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value(5).value(30).build();
+        String ccl = "where age bw 5 $age";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl, data)));
+    }
+
+    @Test
+    public void testParseCCLConjuctionsWithAnd() {
+        String ccl = "name = chandresh pancholi on last christmas day && favovite_player != C. Ronaldo during last year";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        Assert.assertEquals(3, symbols.size());
+        for (int i = 0; i < 2; i++) {
+            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+            Assert.assertTrue(
+                    expr.values().get(0).value().toString().contains(" "));
+            Assert.assertNotEquals(0, expr.raw().timestamp());
+        }
+    }
+
+    @Test
+    public void testParseCclGroupOrAndGroupOr() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .and()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 or b = 2) AND (c = 3 or d = 4)";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+    }
+
+    @Test
+    public void testParseCclGroupOrAndGroupOrConjuctions() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .and()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 || b = 2) && (c = 3 || d = 4)";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+
+    }
+
+    @Test
+    public void testParseCclGroupOrAndGroupOrConjuctionsWithSingleAmpersand() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .and()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 || b = 2) & (c = 3 || d = 4)";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+    }
+
+    @Test
+    public void testParseCclGroupOrOrConjuction() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .or()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 || b = 2) || (c = 3 || d = 4)";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+    }
+
+    @Test
+    public void testParseCclGroupOrOrGroupOr() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .or()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        String ccl = "(a = 1 or b = 2) or (c = 3 or d = 4)";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+    }
+
+    @Test(expected = SyntaxException.class)
+    public void testParseCclInvalidReference() {
+        String ccl = "name = $name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("name", "King James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Compiler compiler = createCompiler();
+        Parsing.toPostfixNotation(compiler.tokenize(compiler.parse(ccl, data)));
+    }
+
+    @Test
+    public void testParseCclLocalReferences() {
+        Criteria criteria = Criteria.where().key("name")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value("Lebron James").build();
+        String ccl = "name = $name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl, data)));
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testParseCclNoSpaces() {
+        String ccl = "name=jeff";
+        Compiler compiler = createCompiler();
+        compiler.arrange((ConditionTree) compiler.parse(ccl));
+    }
+
+    @Test(expected = SyntaxException.class)
+    public void testParseCclReferenceNotFound() {
+        String ccl = "name = $name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+        Compiler compiler = createCompiler();
+        Parsing.toPostfixNotation(compiler.tokenize(compiler.parse(ccl, data)));
+    }
+
+    @Test
+    public void testParseCclSimple() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value("bar").build();
+        String ccl = "where foo = bar";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+
+    }
+
+    @Test
+    public void testParseCclSimpleAnd() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).build();
+        String ccl = "a = 1 and b = 2";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+    }
+
+    @Test
+    public void testParseCclSimpleOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).or().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).build();
+        String ccl = "a = 1 or b = 2";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+    }
+
+    @Test
+    public void testParseCclTimestampBasicPhrase() {
+        String ccl = "name = jeff at \"now\"";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclTimestampComplexPhrase() {
+        String ccl = "name = jeff at \"last christmas\"";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclTimestampNumericPhrase() {
+        String ccl = "name = jeff at \"" + Time.now() + "\"";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclTimestampPhraseWithoutQuotes() {
+        String ccl = "name = jeff at 3 seconds ago";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclValueAndTimestampPhraseWithoutQuotes() {
+        String ccl = "name = jeff nelson on last christmas day";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertEquals("jeff nelson", expr.values().get(0).value());
+        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                           // timestamp was
+                                                           // parsed
+    }
+
+    @Test
+    public void testParseCclValueAndTimestampPhraseWithoutQuotesAnd() {
+        String ccl = "name = jeff nelson on last christmas day and favorite_player != Lebron James during last week";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        Assert.assertEquals(3, symbols.size());
+        for (int i = 0; i < 2; ++i) {
+            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+            Assert.assertTrue(
+                    expr.values().get(0).value().toString().contains(" "));
+            Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
+                                                               // timestamp was
+                                                               // parsed
+        }
+    }
+
+    @Test
+    public void testParseCclValueWithoutQuotes() {
+        String ccl = "name = jeff nelson";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertEquals("jeff nelson", expr.values().get(0).value());
+    }
+
+    @Test
+    public void testParseCclValueWithoutQuotesAnd() {
+        String ccl = "name = jeff nelson and favorite_player != Lebron James";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        Assert.assertEquals(3, symbols.size());
+        for (int i = 0; i < 2; ++i) {
+            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+            Assert.assertTrue(
+                    expr.values().get(0).value().toString().contains(" "));
+        }
+    }
+
+    @Test
+    public void testParserAnalysisIncludesAllCriteriaKeys() {
+        String ccl = "name = jeff and age = 100 and company = cinchapi or company = blavity";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(Sets.newHashSet("name", "age", "company"),
+                compiler.analyze((ConditionTree) compiler.parse(ccl)).keys());
+    }
+
+    @Test
+    public void testPostfixNotationAndGroupOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and()
+                .group(Criteria.where().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).or().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).build())
+                .build();
+        String ccl = "a = 1 and (b = 2 or c = 3)";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+    }
+
+    @Test
+    public void testReproGH_113() {
+        String ccl = "location = \"Atlanta (HQ)\"";
+        Compiler compiler = createCompiler();
+        Queue<PostfixNotationSymbol> symbols = compiler
+                .arrange((ConditionTree) compiler.parse(ccl));
+        Assert.assertEquals(1, symbols.size());
+        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
+        Assert.assertEquals("Atlanta (HQ)", expr.raw().values().get(0));
+    }
+
+    @Test
+    public void testToPostfixNotationAndGroupOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and()
+                .group(Criteria.where().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).or().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).build())
+                .build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 2)),
+                ExpressionSymbol.create(new KeySymbol("c"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(3)));
+        Assert.assertEquals(Iterables.get(pfn, 3), ConjunctionSymbol.OR);
+        Assert.assertEquals(Iterables.get(pfn, 4), ConjunctionSymbol.AND);
+
+    }
+
+    @Test
+    public void testToPostfixNotationAndOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).or().key("c")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(3).build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 5);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.AND);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
+                ExpressionSymbol.create(new KeySymbol("c"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(3)));
+        Assert.assertEquals(Iterables.get(pfn, 4), ConjunctionSymbol.OR);
+    }
+
+    @Test
+    public void testToPostfixNotationGroupOrAndGroupOr() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .and()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
+                ExpressionSymbol.create(new KeySymbol("c"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(3)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 4)),
+                ExpressionSymbol.create(new KeySymbol("d"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(4)));
+        Assert.assertEquals(Iterables.get(pfn, 5), ConjunctionSymbol.OR);
+        Assert.assertEquals(Iterables.get(pfn, 6), ConjunctionSymbol.AND);
+
+    }
+
+    @Test
+    public void testToPostfixNotationGroupOrOrGroupOr() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("a")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(1).or().key("b")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(2).build())
+                .or()
+                .group(Criteria.where().key("c")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(3).or().key("d")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(4).build())
+                .build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
+                ExpressionSymbol.create(new KeySymbol("c"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(3)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 4)),
+                ExpressionSymbol.create(new KeySymbol("d"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(4)));
+        Assert.assertEquals(Iterables.get(pfn, 5), ConjunctionSymbol.OR);
+        Assert.assertEquals(Iterables.get(pfn, 6), ConjunctionSymbol.OR);
+
+    }
+
+    @Test
+    public void testToPostfixNotationSimple() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value("bar").build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 1);
+        Assert.assertEquals(
+                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).key(),
+                new KeySymbol("foo"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
+                .values().get(0), new ValueSymbol("bar"));
+        Assert.assertEquals(
+                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).operator(),
+                new OperatorSymbol(
+                        com.cinchapi.concourse.thrift.Operator.EQUALS));
+    }
+
+    @Test
+    public void testToPostfixNotationSimpleAnd() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).and().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 3);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.AND);
+    }
+
+    @Test
+    public void testToPostfixNotationSimpleBetween() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
+                .value("bar").value("baz").build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 1);
+        Assert.assertEquals(
+                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).key(),
+                new KeySymbol("foo"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
+                .values().get(0), new ValueSymbol("bar"));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
+                .values().get(1), new ValueSymbol("baz"));
+        Assert.assertEquals(
+                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).operator(),
+                new OperatorSymbol(
+                        com.cinchapi.concourse.thrift.Operator.BETWEEN));
+    }
+
+    @Test
+    public void testToPostfixNotationSimpleOr() {
+        Criteria criteria = Criteria.where().key("a")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(1).or().key("b")
+                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                .value(2).build();
+        Queue<PostfixNotationSymbol> pfn = Parsing
+                .toPostfixNotation(Reflection.call(criteria, "symbols"));
+        Assert.assertEquals(pfn.size(), 3);
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
+                ExpressionSymbol.create(new KeySymbol("a"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(1)));
+        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
+                ExpressionSymbol.create(new KeySymbol("b"),
+                        new OperatorSymbol(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS),
+                        new ValueSymbol(2)));
+        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
+    }
+
+    @Test
+    public void testAnalyzeKeysOperator() {
+        String ccl = "name = jeff AND company = Cinchapi and age > 20 or name != bob";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(Sets.newHashSet("name", "company"),
+                compiler.analyze((ConditionTree) compiler.parse(ccl))
+                        .keys(Operator.EQUALS));
+    }
+
+    @Test
+    public void testAnalyzeOperators() {
+        String ccl = "name = jeff AND company = Cinchapi and age > 20 or name != bob";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(
+                Sets.newHashSet(Operator.EQUALS, Operator.GREATER_THAN,
+                        Operator.NOT_EQUALS),
+                compiler.analyze((ConditionTree) compiler.parse(ccl))
+                        .operators());
+    }
+
+    @Test
+    public void testConjunctionPrecedence() {
+        String ccl = "name = jeff OR name = bob AND age > 100";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertEquals(ConjunctionSymbol.OR, ast.root());
+    }
+
+    @Test
+    public void testParseLinksTo() {
+        String ccl1 = "friend lnk2 1";
+        String ccl2 = "friend lnks2 1";
+        String ccl3 = "friend -> 1";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO), compiler
+                .analyze((ConditionTree) compiler.parse(ccl1)).operators());
+        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO), compiler
+                .analyze((ConditionTree) compiler.parse(ccl2)).operators());
+        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO), compiler
+                .analyze((ConditionTree) compiler.parse(ccl3)).operators());
+    }
+
+    @Test
+    public void testParseLikeOperator() {
+        String ccl = "email like %gmail%";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals(Sets.newHashSet(Operator.LIKE), compiler
+                .analyze((ConditionTree) compiler.parse(ccl)).operators());
+    }
+
+    @Test
+    public void testTokenizeUnquotedValueStringWithSpace() {
+        Criteria criteria = Criteria.where().key("name")
+                .operator(Operator.EQUALS).value("Jeff Nelson").and()
+                .group(Criteria.where().key("company").operator(Operator.EQUALS)
+                        .value("Cinchapi").or().key("company")
+                        .operator(Operator.EQUALS).value("Blavity"))
+                .build();
+        String ccl = criteria.ccl();
+        Compiler compiler = createCompiler();
+        List<Symbol> symbols = compiler.tokenize(compiler.parse(ccl));
+        Assert.assertEquals(Lists.newArrayList(new KeySymbol("name"),
+                new OperatorSymbol(Operator.EQUALS),
+                new ValueSymbol("Jeff Nelson"), ConjunctionSymbol.AND,
+                ParenthesisSymbol.LEFT, new KeySymbol("company"),
+                new OperatorSymbol(Operator.EQUALS),
+                new ValueSymbol("Cinchapi"), ConjunctionSymbol.OR,
+                new KeySymbol("company"), new OperatorSymbol(Operator.EQUALS),
+                new ValueSymbol("Blavity"), ParenthesisSymbol.RIGHT), symbols);
+    }
+
+    @Test
+    public void testParseSingleQuotedValue() {
+        String ccl = "location = 'Atlanta (HQ)'";
+        Compiler compiler = createCompiler();
+        Assert.assertEquals("Atlanta (HQ)",
+                ((ExpressionSymbol) compiler
+                        .arrange((ConditionTree) compiler.parse(ccl)).poll())
+                                .raw().values().get(0));
+    }
+
+    @Test
+    public void testParseNumericString() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.EQUALS).value("17").build();
+        Compiler compiler = createCompiler();
+        List<Symbol> tokens = compiler.tokenize(compiler.parse(criteria.ccl()));
+        for (Symbol token : tokens) {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(String.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        }
+    }
+
+    @Test
+    public void testParseNumericTag() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.EQUALS).value(Tag.create("17")).build();
+        Compiler compiler = createCompiler();
+        List<Symbol> tokens = compiler.tokenize(compiler.parse(criteria.ccl()));
+        for (Symbol token : tokens) {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(Tag.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        }
+    }
+
+    @Test
+    public void testParseNonNumericTag() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.EQUALS).value(Tag.create("bar")).build();
+        Compiler compiler = createCompiler();
+        List<Symbol> tokens = compiler.tokenize(compiler.parse(criteria.ccl()));
+        for (Symbol token : tokens) {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(Tag.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        }
+    }
+
+    @Test
+    public void testParseNumericNumber() {
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.EQUALS).value(17).build();
+        Compiler compiler = createCompiler();
+        List<Symbol> tokens = compiler.tokenize(compiler.parse(criteria.ccl()));
+        for (Symbol token : tokens) {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(Integer.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        }
+    }
+
+    @Test
+    public void testCriteriaWithTimestampValueParse() {
+        Timestamp start = Timestamp.now();
+        Timestamp end = Timestamp.now();
+        Criteria criteria = Criteria.where().key("foo")
+                .operator(Operator.BETWEEN).value(start).value(end).build();
+        Compiler compiler = createCompiler();
+        int count = 0;
+        for (Symbol symbol : compiler
+                .tokenize(compiler.parse(criteria.ccl()))) {
+            if(symbol instanceof ValueSymbol) {
+                ValueSymbol $symbol = (ValueSymbol) symbol;
+                Assert.assertEquals(Timestamp.class,
+                        $symbol.value().getClass());
+                Assert.assertTrue($symbol.value().equals(start)
+                        || $symbol.value().equals(end));
+                ++count;
+            }
+        }
+        Assert.assertEquals(2, count);
+    }
+
+    @Test
+    public void testParseOrderMultipleKeysWithIndependentDirection() {
+        String ccl = "ORDER BY name ASC, age, email desc";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(3, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
+                new OrderComponentSymbol(new KeySymbol("name"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
+                new OrderComponentSymbol(new KeySymbol("age"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
+                new OrderComponentSymbol(new KeySymbol("email"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.DESCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testParseOrderWithSingleKey() {
+        String ccl = "ORDER BY name";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(1, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList
+                .of(new OrderComponentSymbol(new KeySymbol("name"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testParseOrderWithSingleKeyDirection() {
+        String ccl = "ORDER BY name DESC";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(1, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList
+                .of(new OrderComponentSymbol(new KeySymbol("name"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.DESCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testParseOrderWithSingleKeyTimestamp() {
+        String ccl = "ORDER BY name at last week";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(1, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList
+                .of(new OrderComponentSymbol(new KeySymbol("name"),
+                        new TimestampSymbol(
+                                NaturalLanguage.parseMicros("last week"),
+                                TimeUnit.DAYS),
+                        DirectionSymbol.ASCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testParseOrderWithSingleKeyDirectionTimestamp() {
+        String ccl = "ORDER BY name DESC at last week";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(1, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList
+                .of(new OrderComponentSymbol(new KeySymbol("name"),
+                        new TimestampSymbol(
+                                NaturalLanguage.parseMicros("last week"),
+                                TimeUnit.DAYS),
+                        DirectionSymbol.DESCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testParseOrderWithMultipleKeys() {
+        String ccl = "ORDER BY name, age";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(2, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
+                new OrderComponentSymbol(new KeySymbol("name"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
+                new OrderComponentSymbol(new KeySymbol("age"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testParseOrderWithMultipleKeysBothDirection() {
+        String ccl = "ORDER BY name ASC, age desc";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(2, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
+                new OrderComponentSymbol(new KeySymbol("name"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
+                new OrderComponentSymbol(new KeySymbol("age"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.DESCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testParseOrderWithMultipleKeysBothTimestamp() {
+        String ccl = "ORDER BY name at last week, age at a month ago";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(2, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
+                new OrderComponentSymbol(new KeySymbol("name"),
+                        new TimestampSymbol(
+                                NaturalLanguage.parseMicros("last week"),
+                                TimeUnit.DAYS),
+                        DirectionSymbol.ASCENDING),
+                new OrderComponentSymbol(new KeySymbol("age"),
+                        new TimestampSymbol(
+                                NaturalLanguage.parseMicros("a month ago"),
+                                TimeUnit.DAYS),
+                        DirectionSymbol.ASCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testParseOrderWithMultipleKeysBothDirectionTimestamp() {
+        String ccl = "ORDER BY name desc at last week, age ASC at a month ago";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(2, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
+                new OrderComponentSymbol(new KeySymbol("name"),
+                        new TimestampSymbol(
+                                NaturalLanguage.parseMicros("last week"),
+                                TimeUnit.DAYS),
+                        DirectionSymbol.DESCENDING),
+                new OrderComponentSymbol(new KeySymbol("age"),
+                        new TimestampSymbol(
+                                NaturalLanguage.parseMicros("a month ago"),
+                                TimeUnit.DAYS),
+                        DirectionSymbol.ASCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testParseOrderWithMultipleKeysSomeDirectionTimestamp() {
+        String ccl = "ORDER BY name desc, email, age at a month ago";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        Assert.assertTrue(ast instanceof OrderTree);
+        OrderTree tree = (OrderTree) ast;
+        OrderSymbol symbol = (OrderSymbol) tree.root();
+        Assert.assertEquals(3, symbol.components().size());
+        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
+                new OrderComponentSymbol(new KeySymbol("name"),
+                        TimestampSymbol.PRESENT,
+                        DirectionSymbol.DESCENDING),
+                new OrderComponentSymbol(new KeySymbol("email"),
+                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
+                new OrderComponentSymbol(new KeySymbol("age"),
+                        new TimestampSymbol(
+                                NaturalLanguage.parseMicros("a month ago"),
+                                TimeUnit.DAYS),
+                        DirectionSymbol.ASCENDING));
+        for (int i = 0; i < expectedComponents.size(); ++i) {
+            OrderComponentSymbol expected = expectedComponents.get(i);
+            OrderComponentSymbol actual = symbol.components().get(i);
+            Assert.assertEquals(expected, actual);
+        }
+    }
+    
+    @Test
+    public void testParseLikeValueWithWhitespace() {
+        String ccl = "school like %North Carolina%";
+        Compiler compiler = createCompiler();
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        ExpressionTree expression = (ExpressionTree) ast;
+        ExpressionSymbol symbol = (ExpressionSymbol) expression.root();
+        Assert.assertEquals(new ValueSymbol("%North Carolina%"), symbol.values().iterator().next());
+    }
+
+    protected abstract Compiler createCompiler();
+
+    private void doTestAbstractSyntaxTreeGeneration(String ccl) {
+        Compiler compiler = createCompiler();
+        Visitor<Queue<Symbol>> visitor = new Visitor<Queue<Symbol>>() {
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Queue<Symbol> visit(CommandTree tree, Object... data) {
+                Queue<Symbol> queue = (Queue<Symbol>) data[0];
+                if(tree.children().size() == 2) {
+                    tree.conditionTree().accept(this, data);
+                    tree.pageTree().accept(this, data);
+                    return queue;
+                }
+                else {
+                    tree.conditionTree().accept(this, data);
+                    return queue;
+                }
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Queue<Symbol> visit(ConjunctionTree tree, Object... data) {
+                Queue<Symbol> queue = (Queue<Symbol>) data[0];
+                tree.left().accept(this, data);
+                tree.right().accept(this, data);
+                queue.add(tree.root());
+                return queue;
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Queue<Symbol> visit(ExpressionTree tree, Object... data) {
+                Queue<Symbol> queue = (Queue<Symbol>) data[0];
+                queue.add(tree.root());
+                return queue;
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Queue<Symbol> visit(OrderTree tree, Object... data) {
+                Queue<Symbol> queue = (Queue<Symbol>) data[0];
+                queue.add(tree.root());
+                return queue;
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Queue<Symbol> visit(PageTree tree, Object... data) {
+                Queue<Symbol> queue = (Queue<Symbol>) data[0];
+                queue.add(tree.root());
+                return queue;
+            }
+
+            @SuppressWarnings("unchecked")
+            @Override
+            public Queue<Symbol> visit(FunctionTree tree,
+                    Object... data) {
+                Queue<Symbol> queue = (Queue<Symbol>) data[0];
+                queue.add(tree.root());
+                return queue;
+            }
+        };
+        Queue<Symbol> queue = compiler.parse(ccl).accept(visitor,
+                new LinkedList<Symbol>());
+        Assert.assertEquals(queue,
+                compiler.arrange((ConditionTree) compiler.parse(ccl)));
+    }
+
+}
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl;
+
+import java.util.function.Function;
+
+import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.concourse.util.Convert;
+import com.google.common.collect.Multimap;
+
+/**
+ * Abstract implementation of {@link ParserTest}.
+ * 
+ * @author Jeff Nelson
+ * 
+ * @deprecated Replaced by {@link AbstractCompilerTest}
+ */
+@Deprecated
+public abstract class AbstractParserTest extends ParserTest {
+
+    @Override
+    protected final Parser createParser(String ccl) {
+        return createParser(ccl, (value) -> Convert.stringToJava(value),
+                (operator) -> Convert.stringToOperator(operator));
+    }
+
+    @Override
+    protected final Parser createParser(String ccl,
+            Multimap<String, Object> data) {
+        return createParser(ccl, data, (value) -> Convert.stringToJava(value),
+                (operator) -> Convert.stringToOperator(operator));
+    }
+
+    protected abstract Parser createParser(String ccl,
+            Function<String, Object> valueTransformFunction,
+            Function<String, Operator> operatorTransformFunction);
+
+    protected abstract Parser createParser(String ccl,
+            Multimap<String, Object> data,
+            Function<String, Object> valueTransformFunction,
+            Function<String, Operator> operatorTransformFunction);
+
+}/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl;
+
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.common.base.Array;
+import com.cinchapi.concourse.thrift.TObject;
+import com.cinchapi.concourse.util.Convert;
+import com.google.common.collect.ImmutableMultimap;
+import com.google.common.collect.Multimap;
+
+/**
+ * {@link ParserTest} that uses the {@link JavaCCParser}
+ * 
+ * @author Jeff Nelson
+ * @deprecated Replaced by {@link CompilerJavaCCTest}
+ */
+@Deprecated
+public class JavaCCParserTest extends AbstractParserTest {
+
+    @Override
+    protected Parser createParser(String ccl,
+            Function<String, Object> valueTransformFunction,
+            Function<String, Operator> operatorTransformFunction) {
+        return Parser.create(ccl, valueTransformFunction,
+                operatorTransformFunction);
+    }
+
+    @Override
+    protected Parser createParser(String ccl, Multimap<String, Object> data,
+            Function<String, Object> valueTransformFunction,
+            Function<String, Operator> operatorTransformFunction) {
+        return Parser.create(ccl, data, valueTransformFunction,
+                operatorTransformFunction);
+    }
+
+    @Test
+    public void testParseCclNoSpaces() {
+        String ccl = "name=jeff";
+        Parser parser = createParser(ccl);
+        parser.order();
+
+        Assert.assertEquals(ExpressionSymbol.create(new KeySymbol("name"),
+                new OperatorSymbol(
+                        com.cinchapi.concourse.thrift.Operator.EQUALS),
+                new ValueSymbol("jeff")), parser.order().peek());
+    }
+
+    @Test
+    public void testLocalEvaluationAnd() {
+        String ccl = "a > 1 AND b bw 10 15";
+        Parser parser = Parser.create(ccl, Convert::stringToJava,
+                Convert::stringToOperator, (value, operator, values) -> {
+                    TObject tvalue = Convert.javaToThrift(value);
+                    TObject[] tvalues = values.stream()
+                            .map(Convert::javaToThrift)
+                            .collect(Collectors.toList())
+                            .toArray(Array.containing());
+                    com.cinchapi.concourse.thrift.Operator toperator = Convert
+                            .stringToOperator(operator.symbol());
+                    return tvalue.is(toperator, tvalues);
+                });
+        Multimap<String, Object> passes = ImmutableMultimap.of("a", 5, "b", 12,
+                "c", 4, "a", -1);
+        Assert.assertTrue(parser.evaluate(passes));
+        Multimap<String, Object> fails = ImmutableMultimap.of("a", 1, "b", 12,
+                "c", 4, "a", -1);
+        Assert.assertFalse(parser.evaluate(fails));
+        Multimap<String, Object> missing = ImmutableMultimap.of("a", 1, "c", 4,
+                "a", -1);
+        Assert.assertFalse(parser.evaluate(missing));
+    }
+
+    @Test
+    public void testLocalEvaluationOr() {
+        String ccl = "a > 1 OR b bw 10 15";
+        Parser parser = Parser.create(ccl, Convert::stringToJava,
+                Convert::stringToOperator, (value, operator, values) -> {
+                    TObject tvalue = Convert.javaToThrift(value);
+                    TObject[] tvalues = values.stream()
+                            .map(Convert::javaToThrift)
+                            .collect(Collectors.toList())
+                            .toArray(Array.containing());
+                    com.cinchapi.concourse.thrift.Operator toperator = Convert
+                            .stringToOperator(operator.symbol());
+                    return tvalue.is(toperator, tvalues);
+                });
+        Multimap<String, Object> a = ImmutableMultimap.of("a", 5, "b", 12, "c",
+                4, "a", -1);
+        Assert.assertTrue(parser.evaluate(a));
+        Multimap<String, Object> b = ImmutableMultimap.of("a", 1, "b", 12, "c",
+                4, "a", -1);
+        Assert.assertTrue(parser.evaluate(b));
+        Multimap<String, Object> c = ImmutableMultimap.of("a", 2, "c", 4, "a",
+                -1);
+        Assert.assertTrue(parser.evaluate(c));
+        Multimap<String, Object> d = ImmutableMultimap.of("a", 1, "c", 4, "a",
+                -1);
+        Assert.assertFalse(parser.evaluate(d));
+    }
+
+}/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl;
+
+import com.cinchapi.ccl.grammar.ConjunctionSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ParenthesisSymbol;
+import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.Symbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.AndTree;
+import com.cinchapi.ccl.syntax.ConjunctionTree;
+import com.cinchapi.ccl.syntax.ExpressionTree;
+import com.cinchapi.ccl.syntax.OrTree;
+import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.ccl.type.function.IndexFunction;
+import com.cinchapi.ccl.type.function.KeyConditionFunction;
+import com.cinchapi.ccl.type.function.KeyRecordsFunction;
+import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
+import com.cinchapi.concourse.Tag;
+import com.cinchapi.concourse.lang.Criteria;
+import com.cinchapi.concourse.util.Convert;
+import com.google.common.collect.LinkedHashMultimap;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Queue;
+import java.util.function.Function;
+
+/**
+ * Tests for {@link JavaCCParser}.
+ *
+ * These tests include utput tests (postfix, abstract
+ * syntax tree, tokens)
+ * 
+ * @deprecated Replaced by {@link CompilerJavaCCLogicTest}
+ */
+@Deprecated
+public class JavaCCParserLogicTest {
+
+    @Test
+    public void testSingleExpressionTokenize() {
+        String ccl = "a = 1";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleBinaryExpressionTokenize() {
+        String ccl = "a >< 1 3";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("><")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleNRegexExpressionTokenize() {
+        String ccl = "name nregex (?i:%jeff%)";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("name"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("nregex")));
+        expectedTokens.add(new ValueSymbol(
+                PARSER_TRANSFORM_VALUE_FUNCTION.apply("(?i:%jeff%)")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleLikeExpressionTokenize() {
+        String ccl = "name like (?i:%jeff%)";
+
+        // Build expected queue
+        List<Object> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("name"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("like")));
+        expectedTokens.add(new ValueSymbol(
+                PARSER_TRANSFORM_VALUE_FUNCTION.apply("(?i:%jeff%)")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+
+        List<Symbol> tokens = parser.tokenize();
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleConjunctionTokenize() {
+        String ccl = "a = 1 and b = 2";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleDisjunctionTokenize() {
+        String ccl = "a = 1 or b = 2";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testDoubleConjunctionTokenize() {
+        String ccl = "a = 1 and b = 2 and c = 3";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testDoubleDisjunctionTokenize() {
+        String ccl = "a = 1 or b = 2 or c = 3";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testConjunctionDisjunctionTokenize() {
+        String ccl = "a = 1 and b = 2 or c = 3";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testDisjunctionConjunctionTokenize() {
+        String ccl = "a = 1 or b = 2 and c = 3";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testDisjunctionParenthesizedConjunctionTokenize() {
+        String ccl = "a = 1 and (b = 2 or c = 3)";
+
+        // Build expected queue
+        List<Symbol> expectedTokens = Lists.newArrayList();
+
+        expectedTokens.add(new KeySymbol("a"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
+        expectedTokens.add(ConjunctionSymbol.AND);
+        expectedTokens.add(ParenthesisSymbol.LEFT);
+        expectedTokens.add(new KeySymbol("b"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
+        expectedTokens.add(ConjunctionSymbol.OR);
+        expectedTokens.add(new KeySymbol("c"));
+        expectedTokens.add(new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
+        expectedTokens.add(
+                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
+        expectedTokens.add(ParenthesisSymbol.RIGHT);
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        List<Symbol> tokens = parser.tokenize();
+
+        Assert.assertEquals(expectedTokens, tokens);
+    }
+
+    @Test
+    public void testSingleConjunctionPostFix() {
+        String ccl = "a = 1 and b = 2";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        Queue<PostfixNotationSymbol> order = parser.order();
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testSingleDisjunctionPostFix() {
+        String ccl = "a = 1 or b = 2";
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        Queue<PostfixNotationSymbol> order = parser.order();
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testDoubleConjunctionPostFix() {
+        String ccl = "a = 1 and b = 2 and c = 3";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        Queue<PostfixNotationSymbol> order = parser.order();
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testDoubleDisjunctionPostFix() {
+        String ccl = "a = 1 or b = 2 or c = 3";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        Queue<PostfixNotationSymbol> order = parser.order();
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testConjunctionDisjunctionPostFix() {
+        String ccl = "a = 1 and b = 2 or c = 3";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        Queue<PostfixNotationSymbol> order = parser.order();
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testDisjunctionConjunctionPostFix() {
+        String ccl = "a = 1 or b = 2 and c = 3";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        Queue<PostfixNotationSymbol> order = parser.order();
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testDisjunctionParenthesizedConjunctionPostFix() {
+        String ccl = "a = 1 or (b = 2 and c = 3)";
+
+        // Build expected queue
+        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
+
+        KeySymbol key = new KeySymbol("a");
+        OperatorSymbol operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        ValueSymbol value = new ValueSymbol(
+                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("b");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        key = new KeySymbol("c");
+        operator = new OperatorSymbol(
+                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
+        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
+        expression = ExpressionSymbol.create(key, operator, value);
+        expectedOrder.add(expression);
+
+        expectedOrder.add(ConjunctionSymbol.AND);
+        expectedOrder.add(ConjunctionSymbol.OR);
+
+        // Generate queue
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        Queue<PostfixNotationSymbol> order = parser.order();
+
+        Assert.assertEquals(expectedOrder, order);
+    }
+
+    @Test
+    public void testSingleExpressionAbstractSyntaxTree() {
+        String ccl = "a = 1";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("a", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("1", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testSingleBinaryExpressionAbstractSyntaxTree() {
+        String ccl = "a >< 1 2";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("a", expression.key().toString());
+        Assert.assertEquals("><", expression.operator().toString());
+        Assert.assertEquals("1", expression.values().get(0).toString());
+        Assert.assertEquals("2", expression.values().get(1).toString());
+    }
+
+    @Test
+    public void testSingleConjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 and b = 2";
+
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof AndTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // Left node
+        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
+                .root();
+        Assert.assertEquals("a", leftExpression.key().toString());
+        Assert.assertEquals("=", leftExpression.operator().toString());
+        Assert.assertEquals("1", leftExpression.values().get(0).toString());
+
+        // Right node
+        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
+                .root();
+        Assert.assertEquals("b", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("2", rightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testSingleDisjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 or b = 2";
+
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof OrTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // Left node
+        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
+                .root();
+        Assert.assertEquals("a", leftExpression.key().toString());
+        Assert.assertEquals("=", leftExpression.operator().toString());
+        Assert.assertEquals("1", leftExpression.values().get(0).toString());
+
+        // Right node
+        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
+                .root();
+        Assert.assertEquals("b", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("2", rightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDoubleConjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 and b = 2 and c = 3";
+
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof AndTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // left node
+        Assert.assertTrue(rootNode.left() instanceof AndTree);
+        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
+
+        // right node
+        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
+                .root();
+        Assert.assertEquals("c", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("3", rightExpression.values().get(0).toString());
+
+        // Left left node
+        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
+                .left()).root();
+        Assert.assertEquals("a", leftLeftExpression.key().toString());
+        Assert.assertEquals("=", leftLeftExpression.operator().toString());
+        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
+
+        // Left right node
+        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightRightExpression = (ExpressionSymbol) (leftNode
+                .right()).root();
+        Assert.assertEquals("b", rightRightExpression.key().toString());
+        Assert.assertEquals("=", rightRightExpression.operator().toString());
+        Assert.assertEquals("2",
+                rightRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDoubleDisjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 or b = 2 or c = 3";
+
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof OrTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // left node
+        Assert.assertTrue(rootNode.left() instanceof OrTree);
+        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
+
+        // right node
+        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
+                .root();
+        Assert.assertEquals("c", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("3", rightExpression.values().get(0).toString());
+
+        // Left left node
+        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
+                .left()).root();
+        Assert.assertEquals("a", leftLeftExpression.key().toString());
+        Assert.assertEquals("=", leftLeftExpression.operator().toString());
+        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
+
+        // Left right node
+        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
+        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (leftNode
+                .right()).root();
+        Assert.assertEquals("b", leftRightExpression.key().toString());
+        Assert.assertEquals("=", leftRightExpression.operator().toString());
+        Assert.assertEquals("2",
+                leftRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testConjunctionDisjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 and b = 2 or c = 3";
+
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof OrTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // left node
+        Assert.assertTrue(rootNode.left() instanceof AndTree);
+        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
+
+        // right node
+        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
+                .root();
+        Assert.assertEquals("c", rightExpression.key().toString());
+        Assert.assertEquals("=", rightExpression.operator().toString());
+        Assert.assertEquals("3", rightExpression.values().get(0).toString());
+
+        // Left left node
+        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
+                .left()).root();
+        Assert.assertEquals("a", leftLeftExpression.key().toString());
+        Assert.assertEquals("=", leftLeftExpression.operator().toString());
+        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
+
+        // Left right node
+        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
+        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (leftNode
+                .right()).root();
+        Assert.assertEquals("b", leftRightExpression.key().toString());
+        Assert.assertEquals("=", leftRightExpression.operator().toString());
+        Assert.assertEquals("2",
+                leftRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDisjunctionConjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 or b = 2 and c = 3";
+
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof OrTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // Right node
+        Assert.assertTrue(rootNode.right() instanceof AndTree);
+        ConjunctionTree rightNode = (ConjunctionTree) rootNode.right();
+
+        // right node
+        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
+                .root();
+        Assert.assertEquals("a", leftExpression.key().toString());
+        Assert.assertEquals("=", leftExpression.operator().toString());
+        Assert.assertEquals("1", leftExpression.values().get(0).toString());
+
+        // Right left node
+        Assert.assertTrue(rightNode.left() instanceof ExpressionTree);
+        ExpressionSymbol rightLeftExpression = (ExpressionSymbol) (rightNode
+                .left()).root();
+        Assert.assertEquals("b", rightLeftExpression.key().toString());
+        Assert.assertEquals("=", rightLeftExpression.operator().toString());
+        Assert.assertEquals("2",
+                rightLeftExpression.values().get(0).toString());
+
+        // Right right node
+        Assert.assertTrue(rightNode.right() instanceof ExpressionTree);
+        ExpressionSymbol rightRightExpression = (ExpressionSymbol) (rightNode
+                .right()).root();
+        Assert.assertEquals("c", rightRightExpression.key().toString());
+        Assert.assertEquals("=", rightRightExpression.operator().toString());
+        Assert.assertEquals("3",
+                rightRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDisjunctionParenthesizedConjunctionAbstractSyntaxTree() {
+        String ccl = "a = 1 and (b = 2 or c = 3)";
+
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof AndTree);
+        ConjunctionTree rootNode = (ConjunctionTree) tree;
+
+        // Left node
+        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
+        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
+                .root();
+        Assert.assertEquals("a", leftExpression.key().toString());
+        Assert.assertEquals("=", leftExpression.operator().toString());
+        Assert.assertEquals("1", leftExpression.values().get(0).toString());
+
+        // Right node
+        Assert.assertTrue(rootNode.right() instanceof OrTree);
+        ConjunctionTree rightNode = (ConjunctionTree) rootNode.right();
+
+        // Right left node
+        Assert.assertTrue(rightNode.left() instanceof ExpressionTree);
+        ExpressionSymbol rightLeftExpression = (ExpressionSymbol) (rightNode
+                .left()).root();
+        Assert.assertEquals("b", rightLeftExpression.key().toString());
+        Assert.assertEquals("=", rightLeftExpression.operator().toString());
+        Assert.assertEquals("2",
+                rightLeftExpression.values().get(0).toString());
+
+        // Right right node
+        Assert.assertTrue(rightNode.right() instanceof ExpressionTree);
+        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (rightNode
+                .right()).root();
+        Assert.assertEquals("c", leftRightExpression.key().toString());
+        Assert.assertEquals("=", leftRightExpression.operator().toString());
+        Assert.assertEquals("3",
+                leftRightExpression.values().get(0).toString());
+    }
+
+    @Test
+    public void testParseCclLocalReferences() {
+        String ccl = "name = $name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, data,
+                PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("\"Lebron James\"",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testEscapedCclLocalReferences() {
+        String ccl = "name = \\$name";
+        Multimap<String, Object> data = LinkedHashMultimap.create();
+        data.put("name", "Lebron James");
+        data.put("age", 30);
+        data.put("team", "Cleveland Cavaliers");
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, data,
+                PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("$name", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDoubleQuotedValue() {
+        String ccl = "name = \"Javier Lores\"";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("\"Javier Lores\"",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testDoubleRightAndLeftQuotedValue() {
+        String ccl = "name = “Javier Lores”";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("\"Javier Lores\"",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testQuotedValueWithinQuotedString() {
+        String ccl = "name = \"Javier \\\"Lores\"";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("'Javier \"Lores'",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testNonQuoteEscapedValueWithinQuoteString() {
+        String ccl = "name = \"Javier \\\"\\@Lores\"";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("'Javier \"\\@Lores'",
+                expression.values().get(0).toString());
+    }
+
+    @Test
+    public void validEscapedLocalResolution() {
+        String ccl = "name = \\$name";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("$name", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void validEscapedImplicitLink() {
+        String ccl = "name = \\@name";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("@name", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void validLink() {
+        String ccl = "name -> 30";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("LINKS_TO", expression.operator().toString());
+        Assert.assertEquals("30", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void validOperatorEnum() {
+        String ccl = "name LINKS_TO 30";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("name", expression.key().toString());
+        Assert.assertEquals("LINKS_TO", expression.operator().toString());
+        Assert.assertEquals("30", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testNavigationKey() {
+        String ccl = "mother.children = 3";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("mother.children", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("3", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testLongNavigationKey() {
+        String ccl = "mother.mother.siblings = 3";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("mother.mother.siblings",
+                expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("3", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testPeriodSeparatedValue() {
+        String ccl = "mother = a.b.c";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("mother", expression.key().toString());
+        Assert.assertEquals("=", expression.operator().toString());
+        Assert.assertEquals("a.b.c", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testImplicitRecordFunctionAsEvaluationKey() {
+        String ccl = "friends | avg > 3";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertTrue(expression.key() instanceof FunctionKeySymbol);
+        FunctionKeySymbol symbol = expression.key();
+        Assert.assertEquals("avg", symbol.key().operation());
+        Assert.assertEquals("friends", symbol.key().key());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertEquals("3", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testImplicitIndexFunctionAsEvaluationValue() {
+        String ccl = "age > avg(age)";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((IndexFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((IndexFunction) expression.values().get(0).value()).key());
+    }
+
+    @Test
+    public void testExplicitFunctionWithSingleRecordAsEvaluationValue() {
+        String ccl = "age > avg(age, 1)";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((KeyRecordsFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((KeyRecordsFunction) expression.values().get(0).value())
+                        .key());
+        Assert.assertEquals(1, ((List<Long>) ((KeyRecordsFunction) expression
+                .values().get(0).value()).source()).size());
+        Assert.assertEquals((long) 1,
+                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
+                        .get(0).value()).source()).get(0));
+    }
+
+    @Test
+    public void testExplicitFunctionWithBetween() {
+        String ccl = "age bw avg(age) 1000";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals("><", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((IndexFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((IndexFunction) expression.values().get(0).value()).key());
+
+        Assert.assertEquals("1000", expression.values().get(1).toString());
+    }
+
+    @Test
+    public void testExplicitFunctionWithBetweenCCL() {
+        String ccl = "age bw avg(age, age > 10) 1000";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals("><", expression.operator().toString());
+        KeyConditionFunction function = (KeyConditionFunction) expression
+                .values().get(0).value();
+        Assert.assertTrue(function.source() instanceof ExpressionTree);
+        ExpressionTree t = (ExpressionTree) function.source();
+        ExpressionSymbol root = (ExpressionSymbol) t.root();
+        Assert.assertEquals("age", root.key().key());
+        Assert.assertEquals(">", root.operator().operator().symbol());
+        Assert.assertEquals(10, root.values().get(0).value());
+
+        Assert.assertEquals("1000", expression.values().get(1).toString());
+    }
+
+    @Test
+    public void testExplicitFunctionWithMultipleRecordsAsEvaluationValue() {
+        String ccl = "age > avg(age, 1, 2)";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((KeyRecordsFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((KeyRecordsFunction) expression.values().get(0).value())
+                        .key());
+        Assert.assertEquals(2, ((List<Long>) ((KeyRecordsFunction) expression
+                .values().get(0).value()).source()).size());
+        Assert.assertEquals((long) 1,
+                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
+                        .get(0).value()).source()).get(0));
+        Assert.assertEquals((long) 2,
+                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
+                        .get(0).value()).source()).get(1));
+    }
+
+    @Test
+    public void testExplicitFunctionWithCCLAsEvaluationValue() {
+        String ccl = "age > avg(age, age < 30)";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .key());
+
+        Assert.assertTrue(
+                (((KeyConditionFunction) expression.values().get(0).value())
+                        .source()) instanceof ExpressionTree);
+        Assert.assertEquals("age",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).key()
+                                .toString());
+        Assert.assertEquals("<",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).operator()
+                                .toString());
+        Assert.assertEquals("30",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).values()
+                                .get(0).toString());
+    }
+
+    @Test
+    public void validImplicitRecordFunctionAsEvaluationKeyAndExplicitFunctionWithCCLAsEvaluationValue() {
+        String ccl = "age | avg > avg(age, age < 30)";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertTrue(expression.key() instanceof FunctionKeySymbol);
+        Assert.assertEquals("avg",
+                ((ImplicitKeyRecordFunction) expression.key().key())
+                        .operation());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertTrue(
+                expression.values().get(0) instanceof FunctionValueSymbol);
+        Assert.assertEquals("avg",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .operation());
+        Assert.assertEquals("age",
+                ((KeyConditionFunction) expression.values().get(0).value())
+                        .key());
+
+        Assert.assertTrue(
+                (((KeyConditionFunction) expression.values().get(0).value())
+                        .source()) instanceof ExpressionTree);
+        Assert.assertEquals("age",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).key()
+                                .toString());
+        Assert.assertEquals("<",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).operator()
+                                .toString());
+        Assert.assertEquals("30",
+                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
+                        .values().get(0).value()).source()).root()).values()
+                                .get(0).toString());
+    }
+
+    @Test
+    public void testJsonReservedIdentifier() {
+        String ccl = "$id$ != 40";
+
+        // Generate tree
+        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = parser.parse();
+
+        // Root node
+        Assert.assertTrue(tree instanceof ExpressionTree);
+        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
+        Assert.assertEquals("$id$", expression.key().toString());
+        Assert.assertEquals("!=", expression.operator().toString());
+        Assert.assertEquals("40", expression.values().get(0).toString());
+    }
+
+    @Test
+    public void testReproIX5A() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("_")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value("org.internx.model.data.user.Student"))
+                .and()
+                .group(Criteria.where()
+                        .group(Criteria.where().key("group").operator(
+                                com.cinchapi.concourse.thrift.Operator.LIKE)
+                                .value("%Accounting And Business/management%"))
+                        .or()
+                        .group(Criteria.where().key("major").operator(
+                                com.cinchapi.concourse.thrift.Operator.LIKE)
+                                .value("%accounting and business/management%")));
+
+        // Generate tree
+        Parser parser = Parser.create(criteria.ccl(),
+                PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        parser.tokenize().forEach(token -> {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(String.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        });
+    }
+
+    @Test
+    public void testReproIX5B() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("_")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(Tag
+                                .create("org.internx.model.data.user.Student")))
+                .and()
+                .group(Criteria.where().group(Criteria.where().key("group")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value(Tag
+                                .create("Accounting And Business/management")))
+                        .or()
+                        .group(Criteria.where().key("major").operator(
+                                com.cinchapi.concourse.thrift.Operator.EQUALS)
+                                .value(Tag.create(
+                                        "accounting and business/management"))));
+
+        // Generate tree
+        Parser parser = Parser.create(criteria.ccl(),
+                PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION);
+        parser.tokenize().forEach(token -> {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(Tag.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        });
+    }
+
+    /**
+     * The canonical function to transform strings to java values in a
+     * {@link Parser}.
+     */
+    public final Function<String, Object> PARSER_TRANSFORM_VALUE_FUNCTION = value -> Convert
+            .stringToJava(value);
+
+    /**
+     * The canonical function to transform strings to operators in a
+     * {@link Parser}.
+     */
+    public final Function<String, Operator> PARSER_TRANSFORM_OPERATOR_FUNCTION = operator -> Convert
+            .stringToOperator(operator);
+
+    /**
+     *
+     */
+    @SuppressWarnings("unused")
+    private void printPreOrder(AbstractSyntaxTree tree) {
+        System.out.println(tree.root());
+        for (AbstractSyntaxTree child : tree.children()) {
+            printPreOrder(child);
+        }
+    }
+}/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl;
+
+import java.util.function.Function;
+
+import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.concourse.util.Convert;
+
+/**
+ * Abstract implementation of {@link CompilerTest}.
+ * 
+ * @author Jeff Nelson
+ */
+public abstract class AbstractCompilerTest extends CompilerTest {
+
+    @Override
+    protected final Compiler createCompiler() {
+        return createCompiler((value) -> Convert.stringToJava(value),
+                (operator) -> Convert.stringToOperator(operator));
+    }
+    
+    protected abstract Compiler createCompiler(
+            Function<String, Object> valueTransformFunction,
+            Function<String, Operator> operatorTransformFunction);
+}
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.cinchapi.ccl.syntax;
+
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
+import com.cinchapi.concourse.thrift.Operator;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests for the {@link Visitor} interface
+ */
+public class VisitorTest {
+
+    @Test
+    public void testVisitorPattern() {
+        // Build tree
+        KeyTokenSymbol<String> key = new KeySymbol("key");
+        OperatorSymbol operator = new OperatorSymbol(Operator.EQUALS);
+        ValueTokenSymbol<Object> value = new ValueSymbol("value");
+
+        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
+                value);
+        ExpressionTree leftTree = new ExpressionTree(expression);
+
+        key = new KeySymbol("key");
+        operator = new OperatorSymbol(Operator.EQUALS);
+        value = new ValueSymbol("value");
+
+        expression = ExpressionSymbol.create(key, operator, value);
+        ExpressionTree rightTree = new ExpressionTree(expression);
+
+        AndTree tree = new AndTree(leftTree, rightTree);
+
+        // Test visitor
+        Visitor<Object> visitor = new Visitor<Object>() {
+            @Override
+            public Object visit(CommandTree tree, Object... data) {
+                return data;
+            }
+
+            @Override
+            public Object visit(ConjunctionTree tree, Object... data) {
+                Assert.assertTrue(tree instanceof AndTree);
+                return data;
+            }
+
+            @Override
+            public Object visit(ExpressionTree tree, Object... data) {
+                Assert.assertTrue(((ExpressionSymbol) tree.root()).key()
+                        .toString().equals("key"));
+                Assert.assertTrue(((ExpressionSymbol) tree.root()).operator()
+                        .toString().equals("="));
+                Assert.assertTrue(((ExpressionSymbol) tree.root()).values()
+                        .get(0).toString().equals("value"));
+                return data;
+            }
+
+            @Override
+            public Object visit(PageTree tree, Object... data) {
+                return data;
+            }
+
+            @Override
+            public Object visit(OrderTree tree, Object... data) {
+                return data;
+            }
+
+            @Override
+            public Object visit(FunctionTree tree, Object... data) {
+                return data;
+            }
+
+        };
+        tree.accept(visitor);
+    }
+
+}
diff --git a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
index 5b5afe20..faacbcb7 100644
--- a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
+++ b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
@@ -17,14 +17,14 @@
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
 import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderSymbol;
-import com.cinchapi.ccl.grammar.condition.PageSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.PageSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
@@ -32,7 +32,6 @@
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.syntax.*;
-import com.cinchapi.ccl.syntax.condition.*;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.type.function.IndexFunction;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
@@ -1578,8 +1577,8 @@ public void testSingleExpressionASTWithPage() {
         AbstractSyntaxTree tree = compiler.parse(ccl);
 
         // Root node
-        Assert.assertTrue(tree instanceof QueryTree);
-        QueryTree rootNode = (QueryTree) tree;
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
 
         Assert.assertTrue(rootNode.conditionTree() != null);
         ConditionTree conditionTree = rootNode.conditionTree();
@@ -1591,8 +1590,8 @@ public void testSingleExpressionASTWithPage() {
         Assert.assertEquals("1", expression.values().get(0).toString());
 
         // Page Node
-        Assert.assertTrue(((QueryTree) tree).pageTree() != null);
-        PageSymbol page = (PageSymbol) ((QueryTree) tree).pageTree().root();
+        Assert.assertTrue(((CommandTree) tree).pageTree() != null);
+        PageSymbol page = (PageSymbol) ((CommandTree) tree).pageTree().root();
         Assert.assertEquals(2, page.offset());
         Assert.assertEquals(1, page.limit());
     }
@@ -1961,8 +1960,8 @@ public void testOrderSingleExpressionWithOrderAbstractSyntaxTree() {
         AbstractSyntaxTree tree = compiler.parse(ccl);
 
         // Root node
-        Assert.assertTrue(tree instanceof QueryTree);
-        QueryTree rootNode = (QueryTree) tree;
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
 
         Assert.assertTrue(rootNode.conditionTree() != null);
         ConditionTree conditionTree = rootNode.conditionTree();
@@ -1974,8 +1973,8 @@ public void testOrderSingleExpressionWithOrderAbstractSyntaxTree() {
         Assert.assertEquals("1", expression.values().get(0).toString());
 
         // Order Node
-        Assert.assertTrue(((QueryTree) tree).orderTree() != null);
-        OrderSymbol order = (OrderSymbol) ((QueryTree) tree).orderTree()
+        Assert.assertTrue(((CommandTree) tree).orderTree() != null);
+        OrderSymbol order = (OrderSymbol) ((CommandTree) tree).orderTree()
                 .root();
         Assert.assertEquals(order, expectedOrder);
     }
@@ -1994,8 +1993,8 @@ public void testOrderSingleExpressionWithOrderAndPageAbstractSyntaxTree() {
         AbstractSyntaxTree tree = compiler.parse(ccl);
 
         // Root node
-        Assert.assertTrue(tree instanceof QueryTree);
-        QueryTree rootNode = (QueryTree) tree;
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
 
         Assert.assertTrue(rootNode.conditionTree() != null);
         ConditionTree conditionTree = rootNode.conditionTree();
@@ -2007,14 +2006,14 @@ public void testOrderSingleExpressionWithOrderAndPageAbstractSyntaxTree() {
         Assert.assertEquals("1", expression.values().get(0).toString());
 
         // Order Node
-        Assert.assertTrue(((QueryTree) tree).orderTree() != null);
-        OrderSymbol order = (OrderSymbol) ((QueryTree) tree).orderTree()
+        Assert.assertTrue(((CommandTree) tree).orderTree() != null);
+        OrderSymbol order = (OrderSymbol) ((CommandTree) tree).orderTree()
                 .root();
         Assert.assertEquals(order, expectedOrder);
 
         // Page Node
-        Assert.assertTrue(((QueryTree) tree).pageTree() != null);
-        PageSymbol page = (PageSymbol) ((QueryTree) tree).pageTree().root();
+        Assert.assertTrue(((CommandTree) tree).pageTree() != null);
+        PageSymbol page = (PageSymbol) ((CommandTree) tree).pageTree().root();
         Assert.assertEquals(2, page.offset());
         Assert.assertEquals(1, page.limit());
     }
diff --git a/src/test/java/com/cinchapi/ccl/CompilerJavaCCTest.java b/src/test/java/com/cinchapi/ccl/CompilerJavaCCTest.java
index ccd80516..86c1c2a1 100644
--- a/src/test/java/com/cinchapi/ccl/CompilerJavaCCTest.java
+++ b/src/test/java/com/cinchapi/ccl/CompilerJavaCCTest.java
@@ -22,10 +22,10 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.common.base.Array;
diff --git a/src/test/java/com/cinchapi/ccl/CompilerTest.java b/src/test/java/com/cinchapi/ccl/CompilerTest.java
index bc862232..846e167a 100644
--- a/src/test/java/com/cinchapi/ccl/CompilerTest.java
+++ b/src/test/java/com/cinchapi/ccl/CompilerTest.java
@@ -20,22 +20,22 @@
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
-import com.cinchapi.ccl.syntax.condition.ConjunctionTree;
-import com.cinchapi.ccl.syntax.condition.ExpressionTree;
-import com.cinchapi.ccl.syntax.condition.FunctionTree;
-import com.cinchapi.ccl.syntax.condition.OrderTree;
-import com.cinchapi.ccl.syntax.condition.PageTree;
-import com.cinchapi.ccl.syntax.condition.QueryTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.syntax.ConjunctionTree;
+import com.cinchapi.ccl.syntax.ExpressionTree;
+import com.cinchapi.ccl.syntax.FunctionTree;
+import com.cinchapi.ccl.syntax.OrderTree;
+import com.cinchapi.ccl.syntax.PageTree;
+import com.cinchapi.ccl.syntax.CommandTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
 import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.OrderSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
@@ -1310,7 +1310,7 @@ private void doTestAbstractSyntaxTreeGeneration(String ccl) {
 
             @SuppressWarnings("unchecked")
             @Override
-            public Queue<Symbol> visit(QueryTree tree, Object... data) {
+            public Queue<Symbol> visit(CommandTree tree, Object... data) {
                 Queue<Symbol> queue = (Queue<Symbol>) data[0];
                 if(tree.children().size() == 2) {
                     tree.conditionTree().accept(this, data);
diff --git a/src/test/java/com/cinchapi/ccl/GrammarTest.java b/src/test/java/com/cinchapi/ccl/GrammarTest.java
index e1c15dae..fd2620d7 100644
--- a/src/test/java/com/cinchapi/ccl/GrammarTest.java
+++ b/src/test/java/com/cinchapi/ccl/GrammarTest.java
@@ -20,13 +20,13 @@
 import com.cinchapi.ccl.generated.ASTPage;
 import com.cinchapi.ccl.generated.Grammar;
 import com.cinchapi.ccl.generated.GrammarVisitor;
-import com.cinchapi.ccl.syntax.condition.AndTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
-import com.cinchapi.ccl.syntax.condition.ExpressionTree;
-import com.cinchapi.ccl.syntax.condition.FunctionTree;
-import com.cinchapi.ccl.syntax.condition.OrTree;
-import com.cinchapi.ccl.syntax.condition.OrderTree;
-import com.cinchapi.ccl.syntax.condition.PageTree;
+import com.cinchapi.ccl.syntax.AndTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.syntax.ExpressionTree;
+import com.cinchapi.ccl.syntax.FunctionTree;
+import com.cinchapi.ccl.syntax.OrTree;
+import com.cinchapi.ccl.syntax.OrderTree;
+import com.cinchapi.ccl.syntax.PageTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.generated.ASTAnd;
 import com.cinchapi.ccl.generated.ASTExpression;
diff --git a/src/test/java/com/cinchapi/ccl/JavaCCParserLogicTest.java b/src/test/java/com/cinchapi/ccl/JavaCCParserLogicTest.java
index f8ed8b41..a145520a 100644
--- a/src/test/java/com/cinchapi/ccl/JavaCCParserLogicTest.java
+++ b/src/test/java/com/cinchapi/ccl/JavaCCParserLogicTest.java
@@ -16,20 +16,20 @@
 package com.cinchapi.ccl;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.condition.AndTree;
-import com.cinchapi.ccl.syntax.condition.ConjunctionTree;
-import com.cinchapi.ccl.syntax.condition.ExpressionTree;
-import com.cinchapi.ccl.syntax.condition.OrTree;
+import com.cinchapi.ccl.syntax.AndTree;
+import com.cinchapi.ccl.syntax.ConjunctionTree;
+import com.cinchapi.ccl.syntax.ExpressionTree;
+import com.cinchapi.ccl.syntax.OrTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.type.function.IndexFunction;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
diff --git a/src/test/java/com/cinchapi/ccl/JavaCCParserTest.java b/src/test/java/com/cinchapi/ccl/JavaCCParserTest.java
index b4e51d84..d0e43652 100644
--- a/src/test/java/com/cinchapi/ccl/JavaCCParserTest.java
+++ b/src/test/java/com/cinchapi/ccl/JavaCCParserTest.java
@@ -21,8 +21,8 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.type.Operator;
diff --git a/src/test/java/com/cinchapi/ccl/ParserTest.java b/src/test/java/com/cinchapi/ccl/ParserTest.java
index 0da3634b..0cd7c0ae 100644
--- a/src/test/java/com/cinchapi/ccl/ParserTest.java
+++ b/src/test/java/com/cinchapi/ccl/ParserTest.java
@@ -19,26 +19,19 @@
 import java.util.List;
 import java.util.Queue;
 
-import com.cinchapi.ccl.syntax.condition.ConjunctionTree;
-import com.cinchapi.ccl.syntax.condition.ExpressionTree;
-import com.cinchapi.ccl.syntax.condition.FunctionTree;
-import com.cinchapi.ccl.syntax.condition.OrderTree;
-import com.cinchapi.ccl.syntax.condition.PageTree;
+import com.cinchapi.ccl.syntax.*;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ParenthesisSymbol;
 import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.Symbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.condition.QueryTree;
-import com.cinchapi.ccl.syntax.Visitor;
 import com.cinchapi.common.reflect.Reflection;
 import com.cinchapi.concourse.Tag;
 import com.cinchapi.concourse.Timestamp;
@@ -1075,7 +1068,7 @@ public Queue<Symbol> visit(ExpressionTree tree, Object... data) {
             }
 
             @Override
-            public Queue<Symbol> visit(QueryTree tree, Object... data) {
+            public Queue<Symbol> visit(CommandTree tree, Object... data) {
                 // TODO Auto-generated method stub
                 return null;
             }
diff --git a/src/test/java/com/cinchapi/ccl/syntax/VisitorTest.java b/src/test/java/com/cinchapi/ccl/syntax/VisitorTest.java
index 95cdd692..d840e612 100644
--- a/src/test/java/com/cinchapi/ccl/syntax/VisitorTest.java
+++ b/src/test/java/com/cinchapi/ccl/syntax/VisitorTest.java
@@ -15,13 +15,12 @@
  */
 package com.cinchapi.ccl.syntax;
 
-import com.cinchapi.ccl.grammar.condition.ExpressionSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
-import com.cinchapi.ccl.syntax.condition.*;
 import com.cinchapi.concourse.thrift.Operator;
 import org.junit.Assert;
 import org.junit.Test;
@@ -54,7 +53,7 @@ public void testVisitorPattern() {
         // Test visitor
         Visitor<Object> visitor = new Visitor<Object>() {
             @Override
-            public Object visit(QueryTree tree, Object... data) {
+            public Object visit(CommandTree tree, Object... data) {
                 return data;
             }
 

From 6167d7a221610d834e94b0518bc1a720bb747d77 Mon Sep 17 00:00:00 2001
From: Javier Lores <lores.javier@gmail.com>
Date: Fri, 24 Jan 2025 16:32:00 -0500
Subject: [PATCH 3/9] Updated grammar (in-progress)

---
 grammar/grammar.jjt                           |   38 +-
 .../cinchapi/ccl/generated/ASTCommand.java    |   76 +-
 .../com/cinchapi/ccl/generated/Grammar.java   |   93 +-
 .../ccl/generated/GrammarTokenManager.java    |   32 +
 .../ccl/grammar/command/AddSymbol.java        |   15 +-
 .../ccl/grammar/command/AuditSymbol.java      |    9 +-
 .../ccl/grammar/command/ClearSymbol.java      |   20 +-
 .../ccl/grammar/command/FetchSymbol.java      |   20 +-
 .../ccl/grammar/command/FindSymbol.java       |   22 +-
 .../ccl/grammar/command/GetSymbol.java        |   20 +-
 .../ccl/grammar/command/LinkSymbol.java       |    8 +-
 .../ccl/grammar/command/RemoveSymbol.java     |   14 +-
 .../ccl/grammar/command/RevertSymbol.java     |   20 +-
 .../ccl/grammar/command/SearchSymbol.java     |    8 +-
 .../ccl/grammar/command/SelectSymbol.java     |    8 +-
 .../ccl/grammar/command/SetSymbol.java        |   14 +-
 .../ccl/grammar/command/UnlinkSymbol.java     |    8 +-
 .../grammar/command/VerifyAndSwapSymbol.java  |   20 +-
 .../grammar/command/VerifyOrSetSymbol.java    |   14 +-
 .../ccl/grammar/command/VerifySymbol.java     |   14 +-
 src/test/all_files.txt                        | 7829 -----------------
 21 files changed, 289 insertions(+), 8013 deletions(-)
 delete mode 100644 src/test/all_files.txt

diff --git a/grammar/grammar.jjt b/grammar/grammar.jjt
index ad4586d2..0e1b86a8 100644
--- a/grammar/grammar.jjt
+++ b/grammar/grammar.jjt
@@ -27,25 +27,26 @@ package com.cinchapi.ccl.generated;
 
 import com.cinchapi.ccl.SyntaxException;
 import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
+import com.cinchapi.ccl.grammar.command.*;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
 import com.cinchapi.ccl.type.function.KeyRecordsFunction;
-import com.cinchapi.ccl.grammar.condition.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.condition.FunctionValueSymbol;
+import com.cinchapi.ccl.grammar.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.FunctionValueSymbol;
 import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
 import com.cinchapi.ccl.type.function.IndexFunction;
 import com.cinchapi.ccl.grammar.NavigationKeySymbol;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.condition.OperatorSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OrderComponentSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.condition.PageSymbol;
-import com.cinchapi.ccl.grammar.condition.OrderSymbol;
+import com.cinchapi.ccl.grammar.PageSymbol;
+import com.cinchapi.ccl.grammar.OrderSymbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.condition.ConditionTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.util.NaturalLanguage;
 import com.cinchapi.common.base.AnyStrings;
@@ -53,6 +54,8 @@ import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.function.Function;
@@ -799,7 +802,7 @@ void ClearCommand() #Command :
 {
     KeyTokenSymbol key = null;
     Token record;
-    Collection<KeySymbol> keys = null;
+    Collection<KeyTokenSymbol> keys = null;
     Collection records = null;
 }
 {
@@ -1152,12 +1155,11 @@ void AbortCommand() #Command : {}
     }
 }
 
-void RevertCommand() #Command :
-{
+void RevertCommand() #Command : {
     KeyTokenSymbol key = null;
     Token record = null;
-    Collection<KeySymbol> keys = null;
-    Collection records = null;
+    Collection<KeyTokenSymbol> keys = null;
+    Collection<Long> records = null;
     TimestampSymbol timestamp;
 }
 {
@@ -1165,31 +1167,31 @@ void RevertCommand() #Command :
     (
         LOOKAHEAD(3)
         key=Key() <IN> record=<NUMERIC>
+        <TO> timestamp=Timestamp()
         {
-            jjtThis.setType("REVERT");
-            jjtThis.setKey(key);
-            jjtThis.setRecord(Long.parseLong(record.image));
+            jjtThis.command(new RevertSymbol(key, Long.parseLong(record.image), timestamp));
         }
       |
         LOOKAHEAD(3)
         key=Key() <IN> records=RecordCollection()
+        <TO> timestamp=Timestamp()
         {
             jjtThis.command(new RevertSymbol(key, records, timestamp));
         }
       |
         LOOKAHEAD(3)
         keys=KeyCollection() <IN> record=<NUMERIC>
+        <TO> timestamp=Timestamp()
         {
             jjtThis.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
         }
       |
         keys=KeyCollection() <IN> records=RecordCollection()
+        <TO> timestamp=Timestamp()
         {
             jjtThis.command(new RevertSymbol(keys, records, timestamp));
         }
     )
-    <TO> timestamp=Timestamp()
-    { jjtThis.setTimestamp(timestamp); }
 }
 
 // Utility parsing rules
diff --git a/src/main/java/com/cinchapi/ccl/generated/ASTCommand.java b/src/main/java/com/cinchapi/ccl/generated/ASTCommand.java
index 201449a7..9a1b0de5 100644
--- a/src/main/java/com/cinchapi/ccl/generated/ASTCommand.java
+++ b/src/main/java/com/cinchapi/ccl/generated/ASTCommand.java
@@ -1,23 +1,81 @@
-/* Generated By:JJTree: Do not edit this line. ASTCommand.java Version 7.0 */
-/* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=true,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.cinchapi.ccl.generated;
 
-public
-class ASTCommand extends SimpleNode {
+import com.cinchapi.ccl.grammar.command.CommandSymbol;
+
+/**
+ * The {@code ASTCommand} class represents a specific type of abstract syntax tree (AST)
+ * node for command expressions in the CCL (Concourse Command Language).
+ *
+ * <p>This class extends {@code SimpleNode} and adds functionality to handle
+ * {@link CommandSymbol} objects, which represent the command associated with
+ * the AST node.
+ */
+public class ASTCommand extends SimpleNode {
+  private CommandSymbol command;
+
+  /**
+   * Constructs an {@code ASTCommand} with the given node ID.
+   *
+   * @param id the unique identifier for this AST node
+   */
   public ASTCommand(int id) {
     super(id);
   }
 
+  /**
+   * Constructs an {@code ASTCommand} with the specified grammar and node ID.
+   *
+   * @param p  the grammar parser that creates this node
+   * @param id the unique identifier for this AST node
+   */
   public ASTCommand(Grammar p, int id) {
     super(p, id);
   }
 
+  /**
+   * Sets the command associated with this AST node.
+   *
+   * @param command the {@link CommandSymbol} representing the command
+   */
+  public void command(CommandSymbol command) {
+    this.command = command;
+  }
+
+  /**
+   * Retrieves the command associated with this AST node.
+   *
+   * @return the {@link CommandSymbol} representing the command
+   */
+  public CommandSymbol command() {
+    return command;
+  }
 
-  /** Accept the visitor. **/
+  /**
+   * Accepts a visitor to perform an operation on this AST node.
+   *
+   * <p>This method is part of the visitor pattern implementation.
+   *
+   * @param visitor the {@link GrammarVisitor} to process this node
+   * @param data    additional data passed to the visitor
+   * @return the result of the visitor's operation
+   */
+  @Override
   public Object jjtAccept(GrammarVisitor visitor, Object data) {
-
-    return
-    visitor.visit(this, data);
+    return visitor.visit(this, data);
   }
 }
-/* JavaCC - OriginalChecksum=318455f51b5537991537d05250b83eb1 (do not edit this line) */
diff --git a/src/main/java/com/cinchapi/ccl/generated/Grammar.java b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
index 36180cd8..fed797bc 100644
--- a/src/main/java/com/cinchapi/ccl/generated/Grammar.java
+++ b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
@@ -7,6 +7,7 @@
 import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
+import com.cinchapi.ccl.grammar.command.*;
 import com.cinchapi.ccl.type.function.KeyConditionFunction;
 import com.cinchapi.ccl.type.function.KeyRecordsFunction;
 import com.cinchapi.ccl.grammar.FunctionKeySymbol;
@@ -21,6 +22,7 @@
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.PageSymbol;
 import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 import com.cinchapi.ccl.syntax.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.util.NaturalLanguage;
@@ -29,6 +31,8 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.function.Function;
@@ -1659,8 +1663,8 @@ record = jj_consume_token(NUMERIC);
   final public void SetCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
-    ValueTokenSymbol value;
+    jjtree.openNodeScope(jjtn000);KeySymbol key;
+    ValueSymbol value;
     Token record;
     try {
       jj_consume_token(SET);
@@ -1756,7 +1760,7 @@ final public void ClearCommand() throws ParseException {/*@bgen(jjtree) Command
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
     Token record;
-    Collection<KeySymbol> keys = null;
+    Collection<KeyTokenymbol> keys = null;
     Collection records = null;
     try {
       jj_consume_token(CLEAR);
@@ -2666,8 +2670,8 @@ final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
     Token record = null;
-    Collection<KeySymbol> keys = null;
-    Collection records = null;
+    Collection<KeyTokenSymbol> keys = null;
+    Collection<Long> records = null;
     TimestampSymbol timestamp;
     try {
       jj_consume_token(REVERT);
@@ -2675,18 +2679,28 @@ final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command
         key = Key();
         jj_consume_token(IN);
         record = jj_consume_token(NUMERIC);
-jjtn000.setType("REVERT");
-            jjtn000.setKey(key);
-            jjtn000.setRecord(Long.parseLong(record.image));
+        jj_consume_token(TO);
+        timestamp = Timestamp();
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new RevertSymbol(key, Long.parseLong(record.image), timestamp));
       } else if (jj_2_27(3)) {
         key = Key();
         jj_consume_token(IN);
         records = RecordCollection();
+        jj_consume_token(TO);
+        timestamp = Timestamp();
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
 jjtn000.command(new RevertSymbol(key, records, timestamp));
       } else if (jj_2_28(3)) {
         keys = KeyCollection();
         jj_consume_token(IN);
         record = jj_consume_token(NUMERIC);
+        jj_consume_token(TO);
+        timestamp = Timestamp();
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
 jjtn000.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -2694,6 +2708,10 @@ record = jj_consume_token(NUMERIC);
           keys = KeyCollection();
           jj_consume_token(IN);
           records = RecordCollection();
+          jj_consume_token(TO);
+          timestamp = Timestamp();
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
 jjtn000.command(new RevertSymbol(keys, records, timestamp));
           break;
           }
@@ -2703,11 +2721,6 @@ record = jj_consume_token(NUMERIC);
           throw new ParseException();
         }
       }
-      jj_consume_token(TO);
-      timestamp = Timestamp();
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.setTimestamp(timestamp);
     } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
@@ -3064,18 +3077,6 @@ private boolean jj_2_29(int xla)
     finally { jj_save(28, xla); }
   }
 
-  private boolean jj_3R_65()
- {
-    if (jj_3R_86()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_49()
- {
-    if (jj_3R_71()) return true;
-    return false;
-  }
-
   private boolean jj_3_6()
  {
     Token xsp;
@@ -3718,6 +3719,12 @@ private boolean jj_3R_14()
     return false;
   }
 
+  private boolean jj_3R_38()
+ {
+    if (jj_3R_50()) return true;
+    return false;
+  }
+
   private boolean jj_3_29()
  {
     Token xsp;
@@ -3741,12 +3748,6 @@ private boolean jj_3_29()
     return false;
   }
 
-  private boolean jj_3R_38()
- {
-    if (jj_3R_50()) return true;
-    return false;
-  }
-
   private boolean jj_3R_15()
  {
     Token xsp;
@@ -3848,16 +3849,16 @@ private boolean jj_3R_113()
     return false;
   }
 
-  private boolean jj_3R_72()
+  private boolean jj_3_3()
  {
-    if (jj_scan_token(QUOTED_STRING)) return true;
+    if (jj_3R_13()) return true;
+    if (jj_scan_token(0)) return true;
     return false;
   }
 
-  private boolean jj_3_3()
+  private boolean jj_3R_72()
  {
-    if (jj_3R_13()) return true;
-    if (jj_scan_token(0)) return true;
+    if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
@@ -4200,16 +4201,16 @@ private boolean jj_3R_68()
     return false;
   }
 
-  private boolean jj_3_26()
+  private boolean jj_3R_103()
  {
-    if (jj_3R_21()) return true;
-    if (jj_scan_token(IN)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_103()
+  private boolean jj_3_26()
  {
+    if (jj_3R_21()) return true;
+    if (jj_scan_token(IN)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
@@ -4345,6 +4346,18 @@ private boolean jj_3R_84()
     return false;
   }
 
+  private boolean jj_3R_65()
+ {
+    if (jj_3R_86()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_49()
+ {
+    if (jj_3R_71()) return true;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public GrammarTokenManager token_source;
   SimpleCharStream jj_input_stream;
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
index eae83ec6..eece9b14 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
@@ -1,7 +1,39 @@
 /* GrammarTokenManager.java */
 /* Generated By:JJTree&JavaCC: Do not edit this line. GrammarTokenManager.java */
 package com.cinchapi.ccl.generated;
+import com.cinchapi.ccl.SyntaxException;
+import com.cinchapi.ccl.grammar.DirectionSymbol;
+import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
+import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
+import com.cinchapi.ccl.grammar.command.*;
+import com.cinchapi.ccl.type.function.KeyConditionFunction;
+import com.cinchapi.ccl.type.function.KeyRecordsFunction;
+import com.cinchapi.ccl.grammar.FunctionKeySymbol;
+import com.cinchapi.ccl.grammar.FunctionValueSymbol;
+import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
+import com.cinchapi.ccl.type.function.IndexFunction;
+import com.cinchapi.ccl.grammar.NavigationKeySymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.OperatorSymbol;
+import com.cinchapi.ccl.grammar.OrderComponentSymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.PageSymbol;
+import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
+import com.cinchapi.ccl.syntax.ConditionTree;
+import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.ccl.util.NaturalLanguage;
 import com.cinchapi.common.base.AnyStrings;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Multimap;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.function.Function;
 
 /** Token Manager. */
 public class GrammarTokenManager implements GrammarConstants {
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java
index a02143e7..79be1a6b 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java
@@ -9,16 +9,15 @@
  */
 package com.cinchapi.ccl.grammar.command;
 
-import com.cinchapi.ccl.grammar.command.CommandSymbol;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 
 /**
  * A {@link CommandSymbol} that represents an ADD command.
  */
 public class AddSymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final ValueSymbol value;
+    private final KeyTokenSymbol<?> key;
+    private final ValueTokenSymbol<?> value;
     private final long record;
 
     /**
@@ -28,7 +27,7 @@ public class AddSymbol implements CommandSymbol {
      * @param value the value to add
      * @param record the record identifier
      */
-    public AddSymbol(KeySymbol key, ValueSymbol value, long record) {
+    public AddSymbol(KeyTokenSymbol<?> key, ValueTokenSymbol<?> value, long record) {
         this.key = key;
         this.value = value;
         this.record = record;
@@ -42,14 +41,14 @@ public String type() {
     /**
      * Return the key to add.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
     /**
      * Return the value to add.
      */
-    public ValueSymbol value() {
+    public ValueTokenSymbol<?> value() {
         return value;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java
index b6f8cf08..13f93984 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java
@@ -9,14 +9,15 @@
  */
 package com.cinchapi.ccl.grammar.command;
 
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+
 import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeySymbol;
 
 /**
  * A {@link CommandSymbol} that represents an AUDIT command.
  */
 public class AuditSymbol implements CommandSymbol {
-    private final KeySymbol key;
+    private final KeyTokenSymbol<?> key;
     private final long record;
 
     /**
@@ -25,7 +26,7 @@ public class AuditSymbol implements CommandSymbol {
      * @param key optional key to audit, if null audits entire record
      * @param record the record identifier
      */
-    public AuditSymbol(@Nullable KeySymbol key, long record) {
+    public AuditSymbol(@Nullable KeyTokenSymbol<?> key, long record) {
         this.key = key;
         this.record = record;
     }
@@ -39,7 +40,7 @@ public String type() {
      * Return the key to audit, if specified.
      */
     @Nullable
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/ClearSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/ClearSymbol.java
index 4fb42a31..4ec4a30b 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/ClearSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/ClearSymbol.java
@@ -11,46 +11,46 @@
 
 import java.util.Collection;
 import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a CLEAR command.
  */
 public class ClearSymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final Collection<KeySymbol> keys;
+    private final KeyTokenSymbol<?> key;
+    private final Collection<KeyTokenSymbol<?>> keys;
     private final long record;
     private final Collection<Long> records;
 
     /**
      * Construct a new instance for single key and record.
      */
-    public ClearSymbol(KeySymbol key, long record) {
+    public ClearSymbol(KeyTokenSymbol<?> key, long record) {
         this(key, null, record, null);
     }
 
     /**
      * Construct a new instance for multiple keys and single record.
      */
-    public ClearSymbol(Collection<KeySymbol> keys, long record) {
+    public ClearSymbol(Collection<KeyTokenSymbol<?>> keys, long record) {
         this(null, keys, record, null);
     }
 
     /**
      * Construct a new instance for single key and multiple records.
      */
-    public ClearSymbol(KeySymbol key, Collection<Long> records) {
+    public ClearSymbol(KeyTokenSymbol<?> key, Collection<Long> records) {
         this(key, null, -1, records);
     }
 
     /**
      * Construct a new instance for multiple keys and records.
      */
-    public ClearSymbol(Collection<KeySymbol> keys, Collection<Long> records) {
+    public ClearSymbol(Collection<KeyTokenSymbol<?>> keys, Collection<Long> records) {
         this(null, keys, -1, records);
     }
 
-    private ClearSymbol(@Nullable KeySymbol key, @Nullable Collection<KeySymbol> keys,
+    private ClearSymbol(@Nullable KeyTokenSymbol<?> key, @Nullable Collection<KeyTokenSymbol<?>> keys,
                         long record, @Nullable Collection<Long> records) {
         this.key = key;
         this.keys = keys;
@@ -67,7 +67,7 @@ public String type() {
      * Return the key to clear, if operating on a single key.
      */
     @Nullable
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
@@ -75,7 +75,7 @@ public KeySymbol key() {
      * Return the keys to clear, if operating on multiple keys.
      */
     @Nullable
-    public Collection<KeySymbol> keys() {
+    public Collection<KeyTokenSymbol<?>> keys() {
         return keys;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java
index 626753ee..8bd571ec 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java
@@ -11,15 +11,15 @@
 
 import java.util.Collection;
 import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a FETCH command.
  */
 public class FetchSymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final Collection<KeySymbol> keys;
+    private final KeyTokenSymbol<?> key;
+    private final Collection<KeyTokenSymbol<?>> keys;
     private final long record;
     private final Collection<Long> records;
     private final TimestampSymbol timestamp;
@@ -27,33 +27,33 @@ public class FetchSymbol implements CommandSymbol {
     /**
      * Construct a new instance for single key and record.
      */
-    public FetchSymbol(KeySymbol key, long record, @Nullable TimestampSymbol timestamp) {
+    public FetchSymbol(KeyTokenSymbol<?> key, long record, @Nullable TimestampSymbol timestamp) {
         this(key, null, record, null, timestamp);
     }
 
     /**
      * Construct a new instance for multiple keys and single record.
      */
-    public FetchSymbol(Collection<KeySymbol> keys, long record, @Nullable TimestampSymbol timestamp) {
+    public FetchSymbol(Collection<KeyTokenSymbol<?>> keys, long record, @Nullable TimestampSymbol timestamp) {
         this(null, keys, record, null, timestamp);
     }
 
     /**
      * Construct a new instance for single key and multiple records.
      */
-    public FetchSymbol(KeySymbol key, Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+    public FetchSymbol(KeyTokenSymbol<?> key, Collection<Long> records, @Nullable TimestampSymbol timestamp) {
         this(key, null, -1, records, timestamp);
     }
 
     /**
      * Construct a new instance for multiple keys and records.
      */
-    public FetchSymbol(Collection<KeySymbol> keys, Collection<Long> records,
+    public FetchSymbol(Collection<KeyTokenSymbol<?>> keys, Collection<Long> records,
                        @Nullable TimestampSymbol timestamp) {
         this(null, keys, -1, records, timestamp);
     }
 
-    private FetchSymbol(@Nullable KeySymbol key, @Nullable Collection<KeySymbol> keys,
+    private FetchSymbol(@Nullable KeyTokenSymbol<?> key, @Nullable Collection<KeyTokenSymbol<?>> keys,
                         long record, @Nullable Collection<Long> records, @Nullable TimestampSymbol timestamp) {
         this.key = key;
         this.keys = keys;
@@ -71,7 +71,7 @@ public String type() {
      * Return the key to fetch, if operating on a single key.
      */
     @Nullable
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
@@ -79,7 +79,7 @@ public KeySymbol key() {
      * Return the keys to fetch, if operating on multiple keys.
      */
     @Nullable
-    public Collection<KeySymbol> keys() {
+    public Collection<KeyTokenSymbol<?>> keys() {
         return keys;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java
index 54950b5b..164cecbc 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java
@@ -10,8 +10,8 @@
 package com.cinchapi.ccl.grammar.command;
 
 import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.type.Operator;
 
@@ -19,10 +19,10 @@
  * A {@link CommandSymbol} that represents a FIND command.
  */
 public class FindSymbol implements CommandSymbol {
-    private final KeySymbol key;
+    private final KeyTokenSymbol<?> key;
     private final Operator operator;
-    private final ValueSymbol value;
-    private final ValueSymbol value2;
+    private final ValueTokenSymbol<?> value;
+    private final ValueTokenSymbol<?> value2;
     private final TimestampSymbol timestamp;
 
     /**
@@ -33,7 +33,7 @@ public class FindSymbol implements CommandSymbol {
      * @param value the value to compare
      * @param timestamp optional timestamp for historical search
      */
-    public FindSymbol(KeySymbol key, Operator operator, ValueSymbol value,
+    public FindSymbol(KeyTokenSymbol<?> key, Operator operator, ValueTokenSymbol<?> value,
                       @Nullable TimestampSymbol timestamp) {
         this(key, operator, value, null, timestamp);
     }
@@ -47,8 +47,8 @@ public FindSymbol(KeySymbol key, Operator operator, ValueSymbol value,
      * @param value2 the second value to compare
      * @param timestamp optional timestamp for historical search
      */
-    public FindSymbol(KeySymbol key, Operator operator, ValueSymbol value,
-                      @Nullable ValueSymbol value2, @Nullable TimestampSymbol timestamp) {
+    public FindSymbol(KeyTokenSymbol<?> key, Operator operator, ValueTokenSymbol<?> value,
+                      @Nullable ValueTokenSymbol<?> value2, @Nullable TimestampSymbol timestamp) {
         this.key = key;
         this.operator = operator;
         this.value = value;
@@ -64,7 +64,7 @@ public String type() {
     /**
      * Return the key to find.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
@@ -78,7 +78,7 @@ public Operator operator() {
     /**
      * Return the value to compare.
      */
-    public ValueSymbol value() {
+    public ValueTokenSymbol<?> value() {
         return value;
     }
 
@@ -86,7 +86,7 @@ public ValueSymbol value() {
      * Return the second value for binary operations.
      */
     @Nullable
-    public ValueSymbol value2() {
+    public ValueTokenSymbol<?> value2() {
         return value2;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java
index 88acb79c..82686a16 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java
@@ -11,15 +11,15 @@
 
 import java.util.Collection;
 import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a GET command.
  */
 public class GetSymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final Collection<KeySymbol> keys;
+    private final KeyTokenSymbol<?> key;
+    private final Collection<KeyTokenSymbol<?>> keys;
     private final long record;
     private final Collection<Long> records;
     private final TimestampSymbol timestamp;
@@ -27,33 +27,33 @@ public class GetSymbol implements CommandSymbol {
     /**
      * Construct a new instance for single key and record.
      */
-    public GetSymbol(KeySymbol key, long record, @Nullable TimestampSymbol timestamp) {
+    public GetSymbol(KeyTokenSymbol<?> key, long record, @Nullable TimestampSymbol timestamp) {
         this(key, null, record, null, timestamp);
     }
 
     /**
      * Construct a new instance for multiple keys and single record.
      */
-    public GetSymbol(Collection<KeySymbol> keys, long record, @Nullable TimestampSymbol timestamp) {
+    public GetSymbol(Collection<KeyTokenSymbol<?>> keys, long record, @Nullable TimestampSymbol timestamp) {
         this(null, keys, record, null, timestamp);
     }
 
     /**
      * Construct a new instance for single key and multiple records.
      */
-    public GetSymbol(KeySymbol key, Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+    public GetSymbol(KeyTokenSymbol<?> key, Collection<Long> records, @Nullable TimestampSymbol timestamp) {
         this(key, null, -1, records, timestamp);
     }
 
     /**
      * Construct a new instance for multiple keys and records.
      */
-    public GetSymbol(Collection<KeySymbol> keys, Collection<Long> records,
+    public GetSymbol(Collection<KeyTokenSymbol<?>> keys, Collection<Long> records,
                      @Nullable TimestampSymbol timestamp) {
         this(null, keys, -1, records, timestamp);
     }
 
-    private GetSymbol(@Nullable KeySymbol key, @Nullable Collection<KeySymbol> keys,
+    private GetSymbol(@Nullable KeyTokenSymbol<?> key, @Nullable Collection<KeyTokenSymbol<?>> keys,
                       long record, @Nullable Collection<Long> records, @Nullable TimestampSymbol timestamp) {
         this.key = key;
         this.keys = keys;
@@ -71,7 +71,7 @@ public String type() {
      * Return the key to get, if operating on a single key.
      */
     @Nullable
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
@@ -79,7 +79,7 @@ public KeySymbol key() {
      * Return the keys to get, if operating on multiple keys.
      */
     @Nullable
-    public Collection<KeySymbol> keys() {
+    public Collection<KeyTokenSymbol<?>> keys() {
         return keys;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/LinkSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/LinkSymbol.java
index 042bea0e..28331971 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/LinkSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/LinkSymbol.java
@@ -10,13 +10,13 @@
 package com.cinchapi.ccl.grammar.command;
 
 import java.util.Collection;
-import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a LINK command.
  */
 public class LinkSymbol implements CommandSymbol {
-    private final KeySymbol key;
+    private final KeyTokenSymbol<?> key;
     private final long source;
     private final Collection<Long> destinations;
 
@@ -27,7 +27,7 @@ public class LinkSymbol implements CommandSymbol {
      * @param source the source record
      * @param destinations the destination records
      */
-    public LinkSymbol(KeySymbol key, long source, Collection<Long> destinations) {
+    public LinkSymbol(KeyTokenSymbol<?> key, long source, Collection<Long> destinations) {
         this.key = key;
         this.source = source;
         this.destinations = destinations;
@@ -41,7 +41,7 @@ public String type() {
     /**
      * Return the key to link.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java
index e6b2ead5..55318729 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java
@@ -10,15 +10,15 @@
 package com.cinchapi.ccl.grammar.command;
 
 import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a REMOVE command.
  */
 public class RemoveSymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final ValueSymbol value;
+    private final KeyTokenSymbol<?> key;
+    private final ValueTokenSymbol<?> value;
     private final long record;
 
     /**
@@ -28,7 +28,7 @@ public class RemoveSymbol implements CommandSymbol {
      * @param value the value to remove, if specified
      * @param record the record identifier
      */
-    public RemoveSymbol(KeySymbol key, @Nullable ValueSymbol value, long record) {
+    public RemoveSymbol(KeyTokenSymbol<?> key, @Nullable ValueTokenSymbol<?> value, long record) {
         this.key = key;
         this.value = value;
         this.record = record;
@@ -42,7 +42,7 @@ public String type() {
     /**
      * Return the key to remove.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
@@ -50,7 +50,7 @@ public KeySymbol key() {
      * Return the value to remove, if specified.
      */
     @Nullable
-    public ValueSymbol value() {
+    public ValueTokenSymbol<?> value() {
         return value;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/RevertSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/RevertSymbol.java
index 11705d53..97af1c8c 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/RevertSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/RevertSymbol.java
@@ -11,15 +11,15 @@
 
 import java.util.Collection;
 import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a REVERT command.
  */
 public class RevertSymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final Collection<KeySymbol> keys;
+    private final KeyTokenSymbol<?> key;
+    private final Collection<KeyTokenSymbol<?>> keys;
     private final long record;
     private final Collection<Long> records;
     private final TimestampSymbol timestamp;
@@ -31,7 +31,7 @@ public class RevertSymbol implements CommandSymbol {
      * @param record the record identifier
      * @param timestamp the timestamp to revert to
      */
-    public RevertSymbol(KeySymbol key, long record, TimestampSymbol timestamp) {
+    public RevertSymbol(KeyTokenSymbol<?> key, long record, TimestampSymbol timestamp) {
         this(key, null, record, null, timestamp);
     }
 
@@ -42,7 +42,7 @@ public RevertSymbol(KeySymbol key, long record, TimestampSymbol timestamp) {
      * @param record the record identifier
      * @param timestamp the timestamp to revert to
      */
-    public RevertSymbol(Collection<KeySymbol> keys, long record, TimestampSymbol timestamp) {
+    public RevertSymbol(Collection<KeyTokenSymbol<?>> keys, long record, TimestampSymbol timestamp) {
         this(null, keys, record, null, timestamp);
     }
 
@@ -53,7 +53,7 @@ public RevertSymbol(Collection<KeySymbol> keys, long record, TimestampSymbol tim
      * @param records the record identifiers
      * @param timestamp the timestamp to revert to
      */
-    public RevertSymbol(KeySymbol key, Collection<Long> records, TimestampSymbol timestamp) {
+    public RevertSymbol(KeyTokenSymbol<?> key, Collection<Long> records, TimestampSymbol timestamp) {
         this(key, null, -1, records, timestamp);
     }
 
@@ -64,12 +64,12 @@ public RevertSymbol(KeySymbol key, Collection<Long> records, TimestampSymbol tim
      * @param records the record identifiers
      * @param timestamp the timestamp to revert to
      */
-    public RevertSymbol(Collection<KeySymbol> keys, Collection<Long> records,
+    public RevertSymbol(Collection<KeyTokenSymbol<?>> keys, Collection<Long> records,
                         TimestampSymbol timestamp) {
         this(null, keys, -1, records, timestamp);
     }
 
-    private RevertSymbol(@Nullable KeySymbol key, @Nullable Collection<KeySymbol> keys,
+    private RevertSymbol(@Nullable KeyTokenSymbol<?> key, @Nullable Collection<KeyTokenSymbol<?>> keys,
                          long record, @Nullable Collection<Long> records, TimestampSymbol timestamp) {
         this.key = key;
         this.keys = keys;
@@ -87,7 +87,7 @@ public String type() {
      * Return the key to revert, if operating on a single key.
      */
     @Nullable
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
@@ -95,7 +95,7 @@ public KeySymbol key() {
      * Return the keys to revert, if operating on multiple keys.
      */
     @Nullable
-    public Collection<KeySymbol> keys() {
+    public Collection<KeyTokenSymbol<?>> keys() {
         return keys;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/SearchSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/SearchSymbol.java
index 841224aa..8f60b182 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/SearchSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/SearchSymbol.java
@@ -9,13 +9,13 @@
  */
 package com.cinchapi.ccl.grammar.command;
 
-import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a SEARCH command.
  */
 public class SearchSymbol implements CommandSymbol {
-    private final KeySymbol key;
+    private final KeyTokenSymbol<?> key;
     private final String query;
 
     /**
@@ -24,7 +24,7 @@ public class SearchSymbol implements CommandSymbol {
      * @param key the key to search
      * @param query the search query
      */
-    public SearchSymbol(KeySymbol key, String query) {
+    public SearchSymbol(KeyTokenSymbol<?> key, String query) {
         this.key = key;
         this.query = query;
     }
@@ -37,7 +37,7 @@ public String type() {
     /**
      * Return the key to search.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java
index 8163d8a0..b436949d 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java
@@ -9,7 +9,7 @@
  */
 package com.cinchapi.ccl.grammar.command;
 
-import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 
 import javax.annotation.Nullable;
@@ -18,7 +18,7 @@
  * A {@link CommandSymbol} that represents a SELECT command.
  */
 public class SelectSymbol implements CommandSymbol {
-    private final KeySymbol key;
+    private final KeyTokenSymbol<?> key;
     private final long record;
     private final TimestampSymbol timestamp;
 
@@ -29,7 +29,7 @@ public class SelectSymbol implements CommandSymbol {
      * @param record the record identifier
      * @param timestamp optional timestamp for historical queries
      */
-    public SelectSymbol(KeySymbol key, long record, @Nullable TimestampSymbol timestamp) {
+    public SelectSymbol(KeyTokenSymbol<?> key, long record, @Nullable TimestampSymbol timestamp) {
         this.key = key;
         this.record = record;
         this.timestamp = timestamp;
@@ -43,7 +43,7 @@ public String type() {
     /**
      * Return the key to select.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/SetSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/SetSymbol.java
index 932a450b..084f75fd 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/SetSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/SetSymbol.java
@@ -9,15 +9,15 @@
  */
 package com.cinchapi.ccl.grammar.command;
 
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a SET command.
  */
 public class SetSymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final ValueSymbol value;
+    private final KeyTokenSymbol<?> key;
+    private final ValueTokenSymbol<?> value;
     private final long record;
 
     /**
@@ -27,7 +27,7 @@ public class SetSymbol implements CommandSymbol {
      * @param value the value to set
      * @param record the record identifier
      */
-    public SetSymbol(KeySymbol key, ValueSymbol value, long record) {
+    public SetSymbol(KeyTokenSymbol<?> key, ValueTokenSymbol<?> value, long record) {
         this.key = key;
         this.value = value;
         this.record = record;
@@ -41,14 +41,14 @@ public String type() {
     /**
      * Return the key to set.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
     /**
      * Return the value to set.
      */
-    public ValueSymbol value() {
+    public ValueTokenSymbol<?> value() {
         return value;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/UnlinkSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/UnlinkSymbol.java
index 037905e3..9402b631 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/UnlinkSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/UnlinkSymbol.java
@@ -10,13 +10,13 @@
 package com.cinchapi.ccl.grammar.command;
 
 import java.util.Collection;
-import com.cinchapi.ccl.grammar.KeySymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 
 /**
  * A {@link CommandSymbol} that represents an UNLINK command.
  */
 public class UnlinkSymbol implements CommandSymbol {
-    private final KeySymbol key;
+    private final KeyTokenSymbol<?> key;
     private final long source;
     private final Collection<Long> destinations;
 
@@ -27,7 +27,7 @@ public class UnlinkSymbol implements CommandSymbol {
      * @param source the source record
      * @param destinations the destination records
      */
-    public UnlinkSymbol(KeySymbol key, long source, Collection<Long> destinations) {
+    public UnlinkSymbol(KeyTokenSymbol<?> key, long source, Collection<Long> destinations) {
         this.key = key;
         this.source = source;
         this.destinations = destinations;
@@ -41,7 +41,7 @@ public String type() {
     /**
      * Return the key to unlink.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/VerifyAndSwapSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/VerifyAndSwapSymbol.java
index 1803fef1..d5921c71 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/VerifyAndSwapSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/VerifyAndSwapSymbol.java
@@ -9,16 +9,16 @@
  */
 package com.cinchapi.ccl.grammar.command;
 
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a VERIFY AND SWAP command.
  */
 public class VerifyAndSwapSymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final ValueSymbol expected;
-    private final ValueSymbol replacement;
+    private final KeyTokenSymbol<?> key;
+    private final ValueTokenSymbol<?> expected;
+    private final ValueTokenSymbol<?> replacement;
     private final long record;
 
     /**
@@ -29,8 +29,8 @@ public class VerifyAndSwapSymbol implements CommandSymbol {
      * @param replacement the replacement value
      * @param record the record identifier
      */
-    public VerifyAndSwapSymbol(KeySymbol key, ValueSymbol expected,
-                               ValueSymbol replacement, long record) {
+    public VerifyAndSwapSymbol(KeyTokenSymbol<?> key, ValueTokenSymbol<?> expected,
+                               ValueTokenSymbol<?> replacement, long record) {
         this.key = key;
         this.expected = expected;
         this.replacement = replacement;
@@ -45,21 +45,21 @@ public String type() {
     /**
      * Return the key to verify and swap.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
     /**
      * Return the expected value.
      */
-    public ValueSymbol expected() {
+    public ValueTokenSymbol<?> expected() {
         return expected;
     }
 
     /**
      * Return the replacement value.
      */
-    public ValueSymbol replacement() {
+    public ValueTokenSymbol<?> replacement() {
         return replacement;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/VerifyOrSetSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/VerifyOrSetSymbol.java
index 63ca82df..ef7115e3 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/VerifyOrSetSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/VerifyOrSetSymbol.java
@@ -9,15 +9,15 @@
  */
 package com.cinchapi.ccl.grammar.command;
 
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a VERIFY OR SET command.
  */
 public class VerifyOrSetSymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final ValueSymbol value;
+    private final KeyTokenSymbol<?> key;
+    private final ValueTokenSymbol<?> value;
     private final long record;
 
     /**
@@ -27,7 +27,7 @@ public class VerifyOrSetSymbol implements CommandSymbol {
      * @param value the value to verify or set
      * @param record the record identifier
      */
-    public VerifyOrSetSymbol(KeySymbol key, ValueSymbol value, long record) {
+    public VerifyOrSetSymbol(KeyTokenSymbol<?> key, ValueTokenSymbol<?> value, long record) {
         this.key = key;
         this.value = value;
         this.record = record;
@@ -41,14 +41,14 @@ public String type() {
     /**
      * Return the key to verify or set.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
     /**
      * Return the value to verify or set.
      */
-    public ValueSymbol value() {
+    public ValueTokenSymbol<?> value() {
         return value;
     }
 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/VerifySymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/VerifySymbol.java
index f59ea2eb..1d21c16c 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/VerifySymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/VerifySymbol.java
@@ -10,16 +10,16 @@
 package com.cinchapi.ccl.grammar.command;
 
 import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a VERIFY command.
  */
 public class VerifySymbol implements CommandSymbol {
-    private final KeySymbol key;
-    private final ValueSymbol value;
+    private final KeyTokenSymbol<?> key;
+    private final ValueTokenSymbol<?> value;
     private final long record;
     private final TimestampSymbol timestamp;
 
@@ -31,7 +31,7 @@ public class VerifySymbol implements CommandSymbol {
      * @param record the record identifier
      * @param timestamp optional timestamp for historical verification
      */
-    public VerifySymbol(KeySymbol key, ValueSymbol value, long record,
+    public VerifySymbol(KeyTokenSymbol<?> key, ValueTokenSymbol<?> value, long record,
                         @Nullable TimestampSymbol timestamp) {
         this.key = key;
         this.value = value;
@@ -47,14 +47,14 @@ public String type() {
     /**
      * Return the key to verify.
      */
-    public KeySymbol key() {
+    public KeyTokenSymbol<?> key() {
         return key;
     }
 
     /**
      * Return the value to verify.
      */
-    public ValueSymbol value() {
+    public ValueTokenSymbol<?> value() {
         return value;
     }
 
diff --git a/src/test/all_files.txt b/src/test/all_files.txt
deleted file mode 100644
index 3ac6f1df..00000000
--- a/src/test/all_files.txt
+++ /dev/null
@@ -1,7829 +0,0 @@
-/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl;
-
-import com.cinchapi.ccl.generated.ASTFunction;
-import com.cinchapi.ccl.generated.ASTOrder;
-import com.cinchapi.ccl.generated.ASTPage;
-import com.cinchapi.ccl.generated.Grammar;
-import com.cinchapi.ccl.generated.GrammarVisitor;
-import com.cinchapi.ccl.syntax.AndTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
-import com.cinchapi.ccl.type.Operator;
-import com.cinchapi.ccl.generated.ASTAnd;
-import com.cinchapi.ccl.generated.ASTExpression;
-import com.cinchapi.ccl.generated.ASTOr;
-import com.cinchapi.ccl.generated.ASTStart;
-import com.cinchapi.ccl.generated.SimpleNode;
-import com.cinchapi.concourse.util.Convert;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Multimap;
-import org.junit.Test;
-
-import com.cinchapi.ccl.generated.ParseException;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.StandardCharsets;
-import java.util.function.Function;
-
-/**
- * Tests for {@link Grammar}
- */
-public class GrammarTest {
-
-    @Test
-    public void validUnaryOperatorSingleWordValueExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validUnaryOperatorMultiWordValueExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 2";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validBinaryOperatorExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a >< 1 3";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validImplicitContextFunctionAsEvaluationKey() throws UnsupportedEncodingException, ParseException {
-        String ccl = "friends | avg > 3";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validImplicitIndexFunctionAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
-        String ccl = "age > avg(age)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validExplicitFunctionWithSingleRecordAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
-        String ccl = "age > avg(age, 1)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validExplicitFunctionWithBetween() throws UnsupportedEncodingException, ParseException {
-        String ccl = "age bw avg(age) 1000";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validExplicitFunctionWithBetweenCCL() throws UnsupportedEncodingException, ParseException {
-        String ccl = "age bw avg(age, age > 10) 1000";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validExplicitFunctionWithMultipleRecordsAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
-        String ccl = "age > avg(age, 1, 2)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validExplicitFunctionWithCCLAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
-        String ccl = "age > avg(age, age < 30)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validImplicitRecordFunctionAsEvaluationKeyAndExplicitFunctionWithCCLAsEvaluationValue() throws UnsupportedEncodingException, ParseException {
-        String ccl = "age | avg > avg(age, age < 30)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test (expected = ParseException.class)
-    public void missingSecondOperandBinaryOperator() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a >< 1";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test (expected = ParseException.class)
-    public void tooManyOperandsBinaryOperator() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a >< 1 2 3";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validSingleWordTimestamp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 at today";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validJsonReservedIdentifier() throws UnsupportedEncodingException, ParseException {
-        String ccl = "$id$ != 40";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validMultiwordTimestamp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 on last christmas";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test (expected = ParseException.class)
-    public void missingTimestamp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 at";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validQuotedValue() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name = \"name\"";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void singleLeftAndRightQuotation() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name = ‘name’";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validQuotedValueWithQuote() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name = \"wood\\\"ford\"";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validLocalResolution() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name = $name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, data, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validEscapedLocalResolution() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name = \\$name";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validImplicitLink() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name = @name";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validImplicitEscapedLink() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name = \\@name";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validLink() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a -> 1";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validConjunctionExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 and b = 2";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validDisjunctionExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 or b = 2";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validParenthesizedExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 or (b = 2 and c = 3)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void operatorEnum() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a LINKS_TO 1";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validNavigationKeyAsEvaluationKey() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a.b = 3";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validLongNavigationKeyAsEvaluationKey() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a.b.c.d = 3";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validPeriodSeparatedValue() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = a.b.c";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validRegex() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name nregex (?i:%jeff%)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validLikeWithSecondParenthesizedExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "(a = b) and (name like (?i:%jeff%))";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validLike() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name like (?i:%jeff%)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validSearchMatchWord() throws UnsupportedEncodingException, ParseException {
-        String ccl = "major search_match 'business administration'";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validSearchMatchContains() throws UnsupportedEncodingException, ParseException {
-        String ccl = "major contains 'business administration'";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validSearchMatchOp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "major ~ 'business administration'";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validSearchExcludeWord() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name search_exclude jeff at last week";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validSearchExcludeNotContains() throws UnsupportedEncodingException, ParseException {
-        String ccl = "major not_contains 'business administration'";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validSearchExcludeOP() throws UnsupportedEncodingException, ParseException {
-        String ccl = "name !~ jeff at last week";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test (expected = ParseException.class)
-    public void missingKeyExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "= 1";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test (expected = ParseException.class)
-    public void missingValueExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a =";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test (expected = ParseException.class)
-    public void missingOperatorExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a 1";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test (expected = ParseException.class)
-    public void missingSecondExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 and";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test (expected = ParseException.class)
-    public void missingFirstExpression() throws UnsupportedEncodingException, ParseException {
-        String ccl = "and a = 1";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test (expected = ParseException.class)
-    public void invalidLink() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a LINKS_TO b";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testWithNumber() throws UnsupportedEncodingException, ParseException {
-        String input = PAGE + " 3";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream,
-                PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testWithNumberAndSize() throws UnsupportedEncodingException, ParseException {
-        String input = SIZE + " 1 " + PAGE + " 3";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream,
-                PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testWithSize() throws UnsupportedEncodingException, ParseException {
-        String input = SIZE + " 3";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream,
-                PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testWithSizeAndNumber() throws UnsupportedEncodingException, ParseException {
-        String input = SIZE + " 1 " + PAGE + " 3";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream,
-                PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validUnaryOperatorWithPage() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 page 1 size 3";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKey() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " age";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyAscendingSymbol() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " < age";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyAscendingWord() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " age ASC";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyDescendingSymbol() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " > age";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyDescendingWord() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " age DESC";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyWithNumberTimestamp() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " age at " + String.valueOf(122L);
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyWithStringTimestamp() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " age at \"1992-10-02\"";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyWithNumberTimestampAscending() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + "  > age at " + String.valueOf(122L);
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyWithStringTimestampAscending() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " < age at \"1992-10-02\"";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyWithNumberTimestampDescending() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " > age at " + String.valueOf(122L);
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyWithStringTimestampDescending() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " > age at \"1992-10-02\"";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testMultipleKeys() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " age, salary";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testMultipleKeysWithDirectional() throws UnsupportedEncodingException, ParseException {
-        String input = ORDER + " < age, > salary";
-
-        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validUnaryOperatorWithOrder() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 " + ORDER + " a";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void validUnaryOperatorWithOrderAndPage() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 " + ORDER + " a " + SIZE+ " 3 " + PAGE + " 1";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyMultiRecordsFunction() throws UnsupportedEncodingException, ParseException {
-        String ccl = "avg(age, 1,2,3,5,11)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyMultiRecordsFunctionWithTimestamp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "avg(age, [1,2,3,5,11], at today)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testKeyConditionFunctionWithTimestamp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "avg(age, age > 30, at today)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    @Test
-    public void testIndexFunctionWithTimestamp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "avg(age, at today)";
-        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
-                StandardCharsets.UTF_8.name()));
-        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
-        grammar.generateAST();
-    }
-
-    /**
-     * Constants
-     */
-    private static final String PAGE = "page";
-    private static final String SIZE = "size";
-    private static final String ORDER = "ORDER BY";
-
-    /**
-     * The canonical function to transform strings to java values in a
-     * {@link Parser}.
-     */
-    public final Function<String, Object> PARSER_TRANSFORM_VALUE_FUNCTION = value -> Convert
-            .stringToJava(value);
-
-    /**
-     * The canonical function to transform strings to operators in a
-     * {@link Parser}.
-     */
-    public final Function<String, Operator> PARSER_TRANSFORM_OPERATOR_FUNCTION = operator -> Convert
-            .stringToOperator(operator);
-
-    public final GrammarVisitor visitor = new GrammarVisitor() {
-        @Override
-        public Object visit(SimpleNode node, Object data) {
-            System.out.println(node + ": acceptor not unimplemented in subclass?");
-            data = node.childrenAccept(this, data);
-            return data;
-        }
-
-        @Override
-        public Object visit(ASTStart node, Object data) {
-            data = node.jjtGetChild(0).jjtAccept(this, data);
-            return data;
-        }
-
-        @Override
-        public Object visit(ASTOr node, Object data) {
-            ConditionTree left = (ConditionTree) node.jjtGetChild(0).jjtAccept(this, data);
-            ConditionTree right =(ConditionTree) node.jjtGetChild(1).jjtAccept(this, data);
-            return new OrTree(left, right);
-        }
-
-        @Override
-        public Object visit(ASTAnd node, Object data) {
-            ConditionTree left = (ConditionTree) node.jjtGetChild(0).jjtAccept(this, data);
-            ConditionTree right =(ConditionTree) node.jjtGetChild(1).jjtAccept(this, data);
-            return new AndTree(left, right);
-        }
-
-        @Override
-        public Object visit(ASTExpression node, Object data) {
-            return new ExpressionTree(node);
-        }
-
-        @Override public Object visit(ASTOrder node, Object data) {
-            return new OrderTree(node.order());
-        }
-
-        @Override
-        public Object visit(ASTPage node, Object data) {
-            return new PageTree(node.page());
-        }
-
-        @Override
-        public Object visit(ASTFunction node, Object data) {
-            return new FunctionTree(node.function());
-        }
-    };
-
-}
-/*
- * Copyright (c) 2013-2020 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl.grammar;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.cinchapi.common.base.AnyStrings;
-import com.cinchapi.concourse.Tag;
-import com.cinchapi.concourse.util.Random;
-
-/**
- * Unit tests for {@link ValueSymbol}
- *
- * @author Jeff Nelson
- */
-public class ValueSymbolTest {
-    
-    @Test
-    public void testStringWithEqualSignIsQuoted() {
-        String value = Random.getSimpleString()+"="+Random.getSimpleString();
-        System.out.println(value);
-        ValueSymbol symbol = new ValueSymbol(value);
-        Assert.assertTrue(AnyStrings.isWithinQuotes(symbol.toString()));
-    }
-    
-    @Test
-    public void testTagWithEqualSignIsQuoted() {
-        Tag value = Tag.create(Random.getSimpleString()+"="+Random.getSimpleString());
-        System.out.println(value);
-        ValueSymbol symbol = new ValueSymbol(value);
-        Assert.assertTrue(AnyStrings.isWithinQuotes(symbol.toString()));
-    }
-
-}
-/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl.util;
-
-import org.joda.time.DateTime;
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.cinchapi.concourse.Timestamp;
-
-/**
- * Unit tests for the {@link NaturalLanguage} utils.
- *
- * @author Jeff Nelson
- */
-public class NaturalLanguageTest  {
-
-    @Test
-    public void testParseTimeStringInDefaultFormat() {
-        String str = "Sat Mar 07, 2015 @ 8:11:35:36 PM EST";
-        long expected = Timestamp.parse(str, Timestamp.DEFAULT_FORMATTER)
-                .getMicros();
-        Assert.assertEquals(expected, NaturalLanguage.parseMicros(str));
-    }
-    
-    @Test
-    public void testParseTimeStringFormat1() {
-        String string = "December 30, 1987";
-        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
-        DateTime joda = timestamp.getJoda();
-        Assert.assertEquals(12, joda.getMonthOfYear());
-        Assert.assertEquals(30, joda.getDayOfMonth());
-        Assert.assertEquals(1987, joda.getYear());
-        Assert.assertEquals(0, joda.getHourOfDay());
-        Assert.assertEquals(0, joda.getMinuteOfHour());
-        Assert.assertEquals(0, joda.getSecondOfMinute());
-    }
-    
-    @Test
-    public void testParseTimeStringFormat2() {
-        String string = "Dec 30, 1987";
-        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
-        DateTime joda = timestamp.getJoda();
-        Assert.assertEquals(12, joda.getMonthOfYear());
-        Assert.assertEquals(30, joda.getDayOfMonth());
-        Assert.assertEquals(1987, joda.getYear());
-        Assert.assertEquals(0, joda.getHourOfDay());
-        Assert.assertEquals(0, joda.getMinuteOfHour());
-        Assert.assertEquals(0, joda.getSecondOfMinute());
-    }
-    
-    @Test
-    public void testParseTimeStringFormat3() {
-        String string = "12/30/1987";
-        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
-        DateTime joda = timestamp.getJoda();
-        Assert.assertEquals(12, joda.getMonthOfYear());
-        Assert.assertEquals(30, joda.getDayOfMonth());
-        Assert.assertEquals(1987, joda.getYear());
-        Assert.assertEquals(0, joda.getHourOfDay());
-        Assert.assertEquals(0, joda.getMinuteOfHour());
-        Assert.assertEquals(0, joda.getSecondOfMinute());
-    }
-    
-    @Test
-    public void testParseTimeStringFormat10() {
-        String string = "01-03-1987";
-        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
-        DateTime joda = timestamp.getJoda();
-        Assert.assertEquals(1, joda.getMonthOfYear());
-        Assert.assertEquals(3, joda.getDayOfMonth());
-        Assert.assertEquals(1987, joda.getYear());
-        Assert.assertEquals(0, joda.getHourOfDay());
-        Assert.assertEquals(0, joda.getMinuteOfHour());
-        Assert.assertEquals(0, joda.getSecondOfMinute());
-    }
-    
-    @Test
-    public void testParseTimeStringFormat11() {
-        String string = "1-03-1987";
-        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
-        DateTime joda = timestamp.getJoda();
-        Assert.assertEquals(1, joda.getMonthOfYear());
-        Assert.assertEquals(3, joda.getDayOfMonth());
-        Assert.assertEquals(1987, joda.getYear());
-        Assert.assertEquals(0, joda.getHourOfDay());
-        Assert.assertEquals(0, joda.getMinuteOfHour());
-        Assert.assertEquals(0, joda.getSecondOfMinute());
-    }
-    
-    @Test
-    public void testParseTimeStringFormat12() {
-        String string = "1-3-1987";
-        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
-        DateTime joda = timestamp.getJoda();
-        Assert.assertEquals(1, joda.getMonthOfYear());
-        Assert.assertEquals(3, joda.getDayOfMonth());
-        Assert.assertEquals(1987, joda.getYear());
-        Assert.assertEquals(0, joda.getHourOfDay());
-        Assert.assertEquals(0, joda.getMinuteOfHour());
-        Assert.assertEquals(0, joda.getSecondOfMinute());
-    }
-    
-    @Test
-    public void testParseTimeStringFormat13() {
-        String string = "01-3-1987";
-        Timestamp timestamp = Timestamp.fromMicros(NaturalLanguage.parseMicros(string));
-        DateTime joda = timestamp.getJoda();
-        Assert.assertEquals(1, joda.getMonthOfYear());
-        Assert.assertEquals(3, joda.getDayOfMonth());
-        Assert.assertEquals(1987, joda.getYear());
-        Assert.assertEquals(0, joda.getHourOfDay());
-        Assert.assertEquals(0, joda.getMinuteOfHour());
-        Assert.assertEquals(0, joda.getSecondOfMinute());
-    }
-
-}/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.ParenthesisSymbol;
-import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.Symbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.CommandTree;
-import com.cinchapi.ccl.syntax.Visitor;
-import com.cinchapi.common.reflect.Reflection;
-import com.cinchapi.concourse.Tag;
-import com.cinchapi.concourse.Timestamp;
-import com.cinchapi.concourse.lang.Criteria;
-import com.cinchapi.concourse.thrift.Operator;
-import com.cinchapi.concourse.time.Time;
-import com.cinchapi.concourse.util.Random;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
-
-/**
- * Unit tests for {@link Parser} functionality.
- * 
- * @author Jeff Nelson
- * @deprecated Replaced by {@link CompilerTest}
- */
-@Deprecated
-public abstract class ParserTest {
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationAndGroupOr() {
-        doTestAbstractSyntaxTreeGeneration(
-                "graduation_rate > 90 and (percent_undergrad_black >= 5 or total_cost_out_state > 50000)");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationGroupAndOrGroupAnd() {
-        doTestAbstractSyntaxTreeGeneration(
-                "(graduation_rate > 90 and yield_min = 20) or (percent_undergrad_black >= 5 and total_cost_out_state > 50000)");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationGroupOrAndGroupOr() {
-        doTestAbstractSyntaxTreeGeneration(
-                "(graduation_rate > 90 or yield_min = 20) and (percent_undergrad_black >= 5 or total_cost_out_state > 50000)");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationOrGroupAnd() {
-        doTestAbstractSyntaxTreeGeneration(
-                "graduation_rate > 90 or (percent_undergrad_black >= 5 and total_cost_out_state > 50000)");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationSimpleAndOr() {
-        doTestAbstractSyntaxTreeGeneration(
-                "graduation_rate > 90 AND percent_undergrad_black >= 5 OR total_cost_out_of_state > 50000");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationSimpleOrAnd() {
-        doTestAbstractSyntaxTreeGeneration(
-                "graduation_rate > 90 OR percent_undergrad_black >= 5 AND total_cost_out_of_state > 50000");
-    }
-
-    @Test
-    public void testGroupAnd() {
-        String key0 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
-        Object value0 = Random.getObject();
-        String key1 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
-        Object value1 = Random.getObject();
-        Criteria criteria = Criteria.where().key(key0).operator(operator0)
-                .value(value0).and().key(key1).operator(operator1).value(value1)
-                .build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
-        ConjunctionSymbol sym = (ConjunctionSymbol) symbols.get(1);
-        ExpressionSymbol exp1 = (ExpressionSymbol) symbols.get(2);
-        Assert.assertEquals(3, symbols.size());
-        Assert.assertEquals(exp0.raw().key(), key0);
-        Assert.assertEquals(exp0.raw().operator(), operator0);
-        Assert.assertEquals(exp0.values().get(0).value(), value0);
-        Assert.assertEquals(sym, ConjunctionSymbol.AND);
-        Assert.assertEquals(exp1.raw().key(), key1);
-        Assert.assertEquals(exp1.raw().operator(), operator1);
-        Assert.assertEquals(exp1.values().get(0).value(), value1);
-    }
-
-    @Test
-    public void testGroupOr() {
-        String key0 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
-        Object value0 = Random.getObject();
-        String key1 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
-        Object value1 = Random.getObject();
-        Criteria criteria = Criteria.where().key(key0).operator(operator0)
-                .value(value0).or().key(key1).operator(operator1).value(value1)
-                .build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
-        ConjunctionSymbol sym = (ConjunctionSymbol) symbols.get(1);
-        ExpressionSymbol exp1 = (ExpressionSymbol) symbols.get(2);
-        Assert.assertEquals(3, symbols.size());
-        Assert.assertEquals(exp0.raw().key(), key0);
-        Assert.assertEquals(exp0.raw().operator(), operator0);
-        Assert.assertEquals(exp0.values().get(0).value(), value0);
-        Assert.assertEquals(sym, ConjunctionSymbol.OR);
-        Assert.assertEquals(exp1.raw().key(), key1);
-        Assert.assertEquals(exp1.raw().operator(), operator1);
-        Assert.assertEquals(exp1.values().get(0).value(), value1);
-    }
-
-    @Test
-    public void testGroupSingle() {
-        String key = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator = com.cinchapi.concourse.thrift.Operator.EQUALS;
-        Object value = Random.getObject();
-        Criteria criteria = Criteria.where().key(key).operator(operator)
-                .value(value).build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp = (ExpressionSymbol) symbols.get(0);
-        Assert.assertEquals(1, symbols.size());
-        Assert.assertEquals(exp.raw().key(), key);
-        Assert.assertEquals(exp.raw().operator(), operator);
-        Assert.assertEquals(exp.values().get(0).value(), value);
-    }
-
-    @Test
-    public void testGroupSingleBetween() {
-        String key = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator = com.cinchapi.concourse.thrift.Operator.BETWEEN;
-        Object value = Random.getObject();
-        Object value1 = Random.getObject();
-        Criteria criteria = Criteria.where().key(key).operator(operator)
-                .value(value).value(value1).build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp = (ExpressionSymbol) symbols.get(0);
-        Assert.assertEquals(1, symbols.size());
-        Assert.assertEquals(exp.raw().key(), key);
-        Assert.assertEquals(exp.raw().operator(), operator);
-        Assert.assertEquals(exp.values().get(0).value(), value);
-        Assert.assertEquals(exp.values().get(1).value(), value1);
-    }
-
-    @Test
-    public void testGroupSub() {
-        String key0 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
-        Object value0 = Random.getObject();
-        String key1 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
-        Object value1 = Random.getObject();
-        String key2 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator2 = com.cinchapi.concourse.thrift.Operator.LESS_THAN;
-        Object value2 = Random.getObject();
-        Criteria criteria = Criteria.where().key(key0).operator(operator0)
-                .value(value0).and()
-                .group(Criteria.where().key(key1).operator(operator1)
-                        .value(value1).or().key(key2).operator(operator2)
-                        .value(value2).build())
-                .build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
-        ConjunctionSymbol sym1 = (ConjunctionSymbol) symbols.get(1);
-        ParenthesisSymbol sym2 = (ParenthesisSymbol) symbols.get(2);
-        ExpressionSymbol exp3 = (ExpressionSymbol) symbols.get(3);
-        ConjunctionSymbol sym4 = (ConjunctionSymbol) symbols.get(4);
-        ExpressionSymbol exp5 = (ExpressionSymbol) symbols.get(5);
-        ParenthesisSymbol sym6 = (ParenthesisSymbol) symbols.get(6);
-        Assert.assertEquals(7, symbols.size());
-        Assert.assertEquals(exp0.raw().key(), key0);
-        Assert.assertEquals(exp0.raw().operator(), operator0);
-        Assert.assertEquals(exp0.values().get(0).value(), value0);
-        Assert.assertEquals(ConjunctionSymbol.AND, sym1);
-        Assert.assertEquals(ParenthesisSymbol.LEFT, sym2);
-        Assert.assertEquals(exp3.raw().key(), key1);
-        Assert.assertEquals(exp3.raw().operator(), operator1);
-        Assert.assertEquals(exp3.values().get(0).value(), value1);
-        Assert.assertEquals(ConjunctionSymbol.OR, sym4);
-        Assert.assertEquals(exp5.raw().key(), key2);
-        Assert.assertEquals(exp5.raw().operator(), operator2);
-        Assert.assertEquals(exp5.values().get(0).value(), value2);
-        Assert.assertEquals(ParenthesisSymbol.RIGHT, sym6);
-    }
-
-    @Test(expected = SyntaxException.class)
-    public void testGroupSyntaxException() {
-        List<Symbol> symbols = Lists.<Symbol> newArrayList(new KeySymbol("foo"),
-                new KeySymbol("bar"));
-        Parsing.groupExpressions(symbols);
-    }
-
-    @Test
-    public void testParseCclAndOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value("1").and().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).or().key("c")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(3).build();
-        String ccl = "a = '1' and b = 2 or c = 3";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testParseCclBetween() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value("bar").value("baz").build();
-        String ccl = "where foo bw bar baz";
-        String ccl2 = "where foo >< bar baz";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-        Parser parser2 = createParser(ccl2);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser2.order());
-    }
-
-    @Test
-    public void testParseCclBetweenWithBothReferences() {
-        Criteria criteria = Criteria.where().key("age")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value(30).value(35).build();
-        String ccl = "where age bw $age $retireAge";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("retireAge", 35);
-        data.put("team", "Cleveland Cavaliers");
-        Parser parser = createParser(ccl, data);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testParseCclBetweenWithFirstReference() {
-        Criteria criteria = Criteria.where().key("age")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value(30).value(100).build();
-        String ccl = "where age bw $age 100";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Parser parser = createParser(ccl, data);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testParseCclBetweenWithSecondReference() {
-        Criteria criteria = Criteria.where().key("age")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value(5).value(30).build();
-        String ccl = "where age bw 5 $age";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Parser parser = createParser(ccl, data);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testParseCCLConjuctionsWithAnd() {
-        String ccl = "name = chandresh pancholi on last christmas day && favovite_player != C. Ronaldo during last year";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        Assert.assertEquals(3, symbols.size());
-        for (int i = 0; i < 2; i++) {
-            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-            Assert.assertTrue(
-                    expr.values().get(0).value().toString().contains(" "));
-            Assert.assertNotEquals(0, expr.raw().timestamp());
-        }
-    }
-
-    @Test
-    public void testParseCclGroupOrAndGroupOr() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .and()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 or b = 2) AND (c = 3 or d = 4)";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testParseCclGroupOrAndGroupOrConjuctions() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .and()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 || b = 2) && (c = 3 || d = 4)";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-
-    }
-
-    @Test
-    public void testParseCclGroupOrAndGroupOrConjuctionsWithSingleAmpersand() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .and()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 || b = 2) & (c = 3 || d = 4)";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testParseCclGroupOrOrConjuction() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .or()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 || b = 2) || (c = 3 || d = 4)";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testParseCclGroupOrOrGroupOr() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .or()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 or b = 2) or (c = 3 or d = 4)";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test(expected = SyntaxException.class)
-    public void testParseCclInvalidReference() {
-        String ccl = "name = $name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("name", "King James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Parser parser = createParser(ccl, data);
-        Parsing.toPostfixNotation(parser.tokenize());
-    }
-
-    @Test
-    public void testParseCclLocalReferences() {
-        Criteria criteria = Criteria.where().key("name")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value("Lebron James").build();
-        String ccl = "name = $name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Parser parser = createParser(ccl, data);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testParseCclNoSpaces() {
-        String ccl = "name=jeff";
-        Parser parser = createParser(ccl);
-        parser.order();
-    }
-
-    @Test(expected = SyntaxException.class)
-    public void testParseCclReferenceNotFound() {
-        String ccl = "name = $name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Parser parser = createParser(ccl, data);
-        Parsing.toPostfixNotation(parser.tokenize());
-    }
-
-    @Test
-    public void testParseCclSimple() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value("bar").build();
-        String ccl = "where foo = bar";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-
-    }
-
-    @Test
-    public void testParseCclSimpleAnd() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).build();
-        String ccl = "a = 1 and b = 2";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testParseCclSimpleOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).or().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).build();
-        String ccl = "a = 1 or b = 2";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testParseCclTimestampBasicPhrase() {
-        String ccl = "name = jeff at \"now\"";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclTimestampComplexPhrase() {
-        String ccl = "name = jeff at \"last christmas\"";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclTimestampNumericPhrase() {
-        String ccl = "name = jeff at \"" + Time.now() + "\"";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclTimestampPhraseWithoutQuotes() {
-        String ccl = "name = jeff at 3 seconds ago";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclValueAndTimestampPhraseWithoutQuotes() {
-        String ccl = "name = jeff nelson on last christmas day";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertEquals("jeff nelson", expr.values().get(0).value());
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclValueAndTimestampPhraseWithoutQuotesAnd() {
-        String ccl = "name = jeff nelson on last christmas day and favorite_player != Lebron James during last week";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        Assert.assertEquals(3, symbols.size());
-        for (int i = 0; i < 2; ++i) {
-            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-            Assert.assertTrue(
-                    expr.values().get(0).value().toString().contains(" "));
-            Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                               // timestamp was
-                                                               // parsed
-        }
-    }
-
-    @Test
-    public void testParseCclValueWithoutQuotes() {
-        String ccl = "name = jeff nelson";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertEquals("jeff nelson", expr.values().get(0).value());
-    }
-
-    @Test
-    public void testParseCclValueWithoutQuotesAnd() {
-        String ccl = "name = jeff nelson and favorite_player != Lebron James";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        Assert.assertEquals(3, symbols.size());
-        for (int i = 0; i < 2; ++i) {
-            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-            Assert.assertTrue(
-                    expr.values().get(0).value().toString().contains(" "));
-        }
-    }
-
-    @Test
-    public void testParserAnalysisIncludesAllCriteriaKeys() {
-        String ccl = "name = jeff and age = 100 and company = cinchapi or company = blavity";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(Sets.newHashSet("name", "age", "company"),
-                parser.analyze().keys());;
-    }
-
-    @Test
-    public void testPostfixNotationAndGroupOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and()
-                .group(Criteria.where().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).or().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).build())
-                .build();
-        String ccl = "a = 1 and (b = 2 or c = 3)";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                parser.order());
-    }
-
-    @Test
-    public void testReproGH_113() {
-        String ccl = "location = \"Atlanta (HQ)\"";
-        Parser parser = createParser(ccl);
-        Queue<PostfixNotationSymbol> symbols = parser.order();
-        Assert.assertEquals(1, symbols.size());
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertEquals("Atlanta (HQ)", expr.raw().values().get(0));
-    }
-
-    @Test
-    public void testToPostfixNotationAndGroupOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and()
-                .group(Criteria.where().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).or().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).build())
-                .build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 2)),
-                ExpressionSymbol.create(new KeySymbol("c"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(3)));
-        Assert.assertEquals(Iterables.get(pfn, 3), ConjunctionSymbol.OR);
-        Assert.assertEquals(Iterables.get(pfn, 4), ConjunctionSymbol.AND);
-
-    }
-
-    @Test
-    public void testToPostfixNotationAndOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).or().key("c")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(3).build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 5);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.AND);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
-                ExpressionSymbol.create(new KeySymbol("c"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(3)));
-        Assert.assertEquals(Iterables.get(pfn, 4), ConjunctionSymbol.OR);
-    }
-
-    @Test
-    public void testToPostfixNotationGroupOrAndGroupOr() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .and()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
-                ExpressionSymbol.create(new KeySymbol("c"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(3)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 4)),
-                ExpressionSymbol.create(new KeySymbol("d"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(4)));
-        Assert.assertEquals(Iterables.get(pfn, 5), ConjunctionSymbol.OR);
-        Assert.assertEquals(Iterables.get(pfn, 6), ConjunctionSymbol.AND);
-
-    }
-
-    @Test
-    public void testToPostfixNotationGroupOrOrGroupOr() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .or()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
-                ExpressionSymbol.create(new KeySymbol("c"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(3)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 4)),
-                ExpressionSymbol.create(new KeySymbol("d"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(4)));
-        Assert.assertEquals(Iterables.get(pfn, 5), ConjunctionSymbol.OR);
-        Assert.assertEquals(Iterables.get(pfn, 6), ConjunctionSymbol.OR);
-
-    }
-
-    @Test
-    public void testToPostfixNotationSimple() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value("bar").build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 1);
-        Assert.assertEquals(
-                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).key(),
-                new KeySymbol("foo"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
-                .values().get(0), new ValueSymbol("bar"));
-        Assert.assertEquals(
-                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).operator(),
-                new OperatorSymbol(
-                        com.cinchapi.concourse.thrift.Operator.EQUALS));
-    }
-
-    @Test
-    public void testToPostfixNotationSimpleAnd() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 3);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.AND);
-    }
-
-    @Test
-    public void testToPostfixNotationSimpleBetween() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value("bar").value("baz").build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 1);
-        Assert.assertEquals(
-                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).key(),
-                new KeySymbol("foo"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
-                .values().get(0), new ValueSymbol("bar"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
-                .values().get(1), new ValueSymbol("baz"));
-        Assert.assertEquals(
-                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).operator(),
-                new OperatorSymbol(
-                        com.cinchapi.concourse.thrift.Operator.BETWEEN));
-    }
-
-    @Test
-    public void testToPostfixNotationSimpleOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).or().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 3);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
-    }
-
-    @Test
-    public void testAnalyzeKeysOperator() {
-        String ccl = "name = jeff AND company = Cinchapi and age > 20 or name != bob";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(Sets.newHashSet("name", "company"),
-                parser.analyze().keys(Operator.EQUALS));
-    }
-
-    @Test
-    public void testAnalyzeOperators() {
-        String ccl = "name = jeff AND company = Cinchapi and age > 20 or name != bob";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(Sets.newHashSet(Operator.EQUALS,
-                Operator.GREATER_THAN, Operator.NOT_EQUALS),
-                parser.analyze().operators());
-    }
-
-    @Test
-    public void testConjunctionPrecedence() {
-        String ccl = "name = jeff OR name = bob AND age > 100";
-        Parser parser = createParser(ccl);
-        AbstractSyntaxTree ast = parser.parse();
-        Assert.assertEquals(ConjunctionSymbol.OR, ast.root());
-    }
-
-    @Test
-    public void testParseLinksTo() {
-        String ccl1 = "friend lnk2 1";
-        String ccl2 = "friend lnks2 1";
-        String ccl3 = "friend -> 1";
-        Parser parser1 = createParser(ccl1);
-        Parser parser2 = createParser(ccl2);
-        Parser parser3 = createParser(ccl3);
-        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO),
-                parser1.analyze().operators());
-        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO),
-                parser2.analyze().operators());
-        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO),
-                parser3.analyze().operators());
-    }
-
-    @Test
-    public void testParseLikeOperator() {
-        String ccl = "email like %gmail%";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals(Sets.newHashSet(Operator.LIKE),
-                parser.analyze().operators());
-    }
-
-    @Test
-    public void testTokenizeUnquotedValueStringWithSpace() {
-        Criteria criteria = Criteria.where().key("name")
-                .operator(Operator.EQUALS).value("Jeff Nelson").and()
-                .group(Criteria.where().key("company").operator(Operator.EQUALS)
-                        .value("Cinchapi").or().key("company")
-                        .operator(Operator.EQUALS).value("Blavity"))
-                .build();
-        String ccl = criteria.ccl();
-        Parser parser = createParser(ccl);
-        List<Symbol> symbols = parser.tokenize();
-        Assert.assertEquals(Lists.newArrayList(new KeySymbol("name"),
-                new OperatorSymbol(Operator.EQUALS),
-                new ValueSymbol("Jeff Nelson"), ConjunctionSymbol.AND,
-                ParenthesisSymbol.LEFT, new KeySymbol("company"),
-                new OperatorSymbol(Operator.EQUALS),
-                new ValueSymbol("Cinchapi"), ConjunctionSymbol.OR,
-                new KeySymbol("company"), new OperatorSymbol(Operator.EQUALS),
-                new ValueSymbol("Blavity"), ParenthesisSymbol.RIGHT), symbols);
-    }
-
-    @Test
-    public void testParseSingleQuotedValue() {
-        String ccl = "location = 'Atlanta (HQ)'";
-        Parser parser = createParser(ccl);
-        Assert.assertEquals("Atlanta (HQ)",
-                ((ExpressionSymbol) parser.order().poll()).raw().values()
-                        .get(0));
-    }
-
-    @Test
-    public void testParseNumericString() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.EQUALS).value("17").build();
-        Parser parser = createParser(criteria.ccl());
-        List<Symbol> tokens = parser.tokenize();
-        for (Symbol token : tokens) {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(String.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        }
-    }
-
-    @Test
-    public void testParseNumericTag() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.EQUALS).value(Tag.create("17")).build();
-        Parser parser = createParser(criteria.ccl());
-        List<Symbol> tokens = parser.tokenize();
-        for (Symbol token : tokens) {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(Tag.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        }
-    }
-
-    @Test
-    public void testParseNonNumericTag() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.EQUALS).value(Tag.create("bar")).build();
-        Parser parser = createParser(criteria.ccl());
-        List<Symbol> tokens = parser.tokenize();
-        for (Symbol token : tokens) {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(Tag.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        }
-    }
-
-    @Test
-    public void testParseNumericNumber() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.EQUALS).value(17).build();
-        Parser parser = createParser(criteria.ccl());
-        List<Symbol> tokens = parser.tokenize();
-        for (Symbol token : tokens) {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(Integer.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        }
-    }
-
-    @Test
-    public void testCriteriaWithTimestampValueParse() {
-        Timestamp start = Timestamp.now();
-        Timestamp end = Timestamp.now();
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.BETWEEN).value(start).value(end).build();
-        Parser parser = createParser(criteria.ccl());
-        int count = 0;
-        for (Symbol symbol : parser.tokenize()) {
-            if(symbol instanceof ValueSymbol) {
-                ValueSymbol $symbol = (ValueSymbol) symbol;
-                Assert.assertEquals(Timestamp.class,
-                        $symbol.value().getClass());
-                Assert.assertTrue($symbol.value().equals(start)
-                        || $symbol.value().equals(end));
-                ++count;
-            }
-        }
-        Assert.assertEquals(2, count);
-    }
-
-    protected abstract Parser createParser(String ccl);
-
-    protected abstract Parser createParser(String ccl,
-            Multimap<String, Object> data);
-
-    private void doTestAbstractSyntaxTreeGeneration(String ccl) {
-        Parser parser = createParser(ccl);
-        Visitor<Queue<Symbol>> visitor = new Visitor<Queue<Symbol>>() {
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Queue<Symbol> visit(ConjunctionTree tree, Object... data) {
-                Queue<Symbol> queue = (Queue<Symbol>) data[0];
-                tree.left().accept(this, data);
-                tree.right().accept(this, data);
-                queue.add(tree.root());
-                return queue;
-            }
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Queue<Symbol> visit(ExpressionTree tree, Object... data) {
-                Queue<Symbol> queue = (Queue<Symbol>) data[0];
-                queue.add(tree.root());
-                return queue;
-            }
-
-            @Override
-            public Queue<Symbol> visit(CommandTree tree, Object... data) {
-                // TODO Auto-generated method stub
-                return null;
-            }
-
-            @Override
-            public Queue<Symbol> visit(OrderTree tree, Object... data) {
-                // TODO Auto-generated method stub
-                return null;
-            }
-
-            @Override
-            public Queue<Symbol> visit(PageTree tree, Object... data) {
-                // TODO Auto-generated method stub
-                return null;
-            }
-
-            @Override
-            public Queue<Symbol> visit(FunctionTree tree,
-                    Object... data) {
-                // TODO Auto-generated method stub
-                return null;
-            }
-        };
-        Queue<Symbol> queue = parser.parse().accept(visitor,
-                new LinkedList<Symbol>());
-        Assert.assertEquals(queue, parser.order());
-    }
-
-}/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl;
-
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.type.Operator;
-import com.cinchapi.common.base.Array;
-import com.cinchapi.common.function.TriFunction;
-import com.cinchapi.concourse.thrift.TObject;
-import com.cinchapi.concourse.util.Convert;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.Multimap;
-
-/**
- * {@link CompilerTest} that uses the {@link JavaCCParser}
- * 
- * @author Jeff Nelson
- */
-public class CompilerJavaCCTest extends AbstractCompilerTest {
-
-    @Test
-    public void testParseCclNoSpaces() {
-        String ccl = "name=jeff";
-        Compiler compiler = createCompiler();
-        compiler.arrange((ConditionTree) compiler.parse(ccl));
-
-        Assert.assertEquals(
-                ExpressionSymbol.create(new KeySymbol("name"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol("jeff")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)).peek());
-    }
-
-    @Test
-    public void testLocalEvaluationAnd() {
-        String ccl = "a > 1 AND b bw 10 15";
-        Compiler compiler = createCompiler(Convert::stringToJava,
-                Convert::stringToOperator);
-        Multimap<String, Object> passes = ImmutableMultimap.of("a", 5, "b", 12,
-                "c", 4, "a", -1);
-        TriFunction<Object, Operator, List<Object>, Boolean> evaluator = (value,
-                operator, values) -> {
-            TObject tvalue = Convert.javaToThrift(value);
-            TObject[] tvalues = values.stream().map(Convert::javaToThrift)
-                    .collect(Collectors.toList()).toArray(Array.containing());
-            com.cinchapi.concourse.thrift.Operator toperator = Convert
-                    .stringToOperator(operator.symbol());
-            return tvalue.is(toperator, tvalues);
-        };
-        ConditionTree tree = (ConditionTree) compiler.parse(ccl);
-        Assert.assertTrue(compiler.evaluate(tree, passes, evaluator));
-        Multimap<String, Object> fails = ImmutableMultimap.of("a", 1, "b", 12,
-                "c", 4, "a", -1);
-        Assert.assertFalse(compiler.evaluate(tree, fails, evaluator));
-        Multimap<String, Object> missing = ImmutableMultimap.of("a", 1, "c", 4,
-                "a", -1);
-        Assert.assertFalse(compiler.evaluate(tree, missing, evaluator));
-    }
-
-    @Test
-    public void testLocalEvaluationOr() {
-        String ccl = "a > 1 OR b bw 10 15";
-        Compiler compiler = createCompiler(Convert::stringToJava,
-                Convert::stringToOperator);
-        TriFunction<Object, Operator, List<Object>, Boolean> evaluator = (value,
-                operator, values) -> {
-            TObject tvalue = Convert.javaToThrift(value);
-            TObject[] tvalues = values.stream().map(Convert::javaToThrift)
-                    .collect(Collectors.toList()).toArray(Array.containing());
-            com.cinchapi.concourse.thrift.Operator toperator = Convert
-                    .stringToOperator(operator.symbol());
-            return tvalue.is(toperator, tvalues);
-        };
-        ConditionTree tree = (ConditionTree) compiler.parse(ccl);
-        Multimap<String, Object> a = ImmutableMultimap.of("a", 5, "b", 12, "c",
-                4, "a", -1);
-        Assert.assertTrue(compiler.evaluate(tree, a, evaluator));
-        Multimap<String, Object> b = ImmutableMultimap.of("a", 1, "b", 12, "c",
-                4, "a", -1);
-        Assert.assertTrue(compiler.evaluate(tree, b, evaluator));
-        Multimap<String, Object> c = ImmutableMultimap.of("a", 2, "c", 4, "a",
-                -1);
-        Assert.assertTrue(compiler.evaluate(tree, c, evaluator));
-        Multimap<String, Object> d = ImmutableMultimap.of("a", 1, "c", 4, "a",
-                -1);
-        Assert.assertFalse(compiler.evaluate(tree, d, evaluator));
-    }
-    
-    @Test
-    public void testRegressionV3_1_1A1() {
-        String ccl = "(_ = com.cinchapi.runway.RunwayTest$Adult) AND (email LIKE %email.com%)";
-        Compiler compiler = createCompiler();
-        compiler.parse(ccl);
-        Assert.assertTrue(true); // lack of Exception means the test passes
-    }
-    
-    @Test
-    public void testRegressionV3_1_1A2() {
-        String ccl = "( _ = com.cinchapi.runway.RunwayTest$Adult ) AND ( email LIKE %email.com% )";
-        Compiler compiler = createCompiler();
-        compiler.parse(ccl);
-        Assert.assertTrue(true); // lack of Exception means the test passes
-    }
-
-    @Test
-    public void testRegressionV3_1_1A3() {
-        String ccl = "( _ = com.cinchapi.runway.RunwayTest$Adult ) AND ( a regex b )";
-        Compiler compiler = createCompiler();
-        compiler.parse(ccl);
-        Assert.assertTrue(true); // lack of Exception means the test passes
-    }
-
-    @Override
-    protected Compiler createCompiler(
-            Function<String, Object> valueTransformFunction,
-            Function<String, Operator> operatorTransformFunction) {
-        return Compiler.create(valueTransformFunction,
-                operatorTransformFunction);
-    }
-
-}
-/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl;
-
-import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.FunctionTokenSymbol;
-import com.cinchapi.ccl.grammar.FunctionValueSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.OrderComponentSymbol;
-import com.cinchapi.ccl.grammar.OrderSymbol;
-import com.cinchapi.ccl.grammar.PageSymbol;
-import com.cinchapi.ccl.grammar.ParenthesisSymbol;
-import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.Symbol;
-import com.cinchapi.ccl.grammar.TimestampSymbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.AndTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
-import com.cinchapi.ccl.syntax.CommandTree;
-import com.cinchapi.ccl.type.Operator;
-import com.cinchapi.ccl.type.function.IndexFunction;
-import com.cinchapi.ccl.type.function.KeyConditionFunction;
-import com.cinchapi.ccl.type.function.KeyRecordsFunction;
-import com.cinchapi.ccl.util.NaturalLanguage;
-import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
-import com.cinchapi.concourse.Tag;
-import com.cinchapi.concourse.lang.Criteria;
-import com.cinchapi.concourse.util.Convert;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-
-/**
- * Tests for {@link JavaCCParser}.
- *
- * These tests include utput tests (postfix, abstract
- * syntax tree, tokens)
- */
-public class CompilerJavaCCLogicTest {
-
-    @Test
-    public void testSingleExpressionTokenize() {
-        String ccl = "a = 1";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleBinaryExpressionTokenize() {
-        String ccl = "a >< 1 3";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("><")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleNRegexExpressionTokenize() {
-        String ccl = "name nregex (?i:%jeff%)";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("name"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("nregex")));
-        expectedTokens.add(new ValueSymbol(
-                COMPILER_PARSE_VALUE_FUNCTION.apply("(?i:%jeff%)")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleLikeExpressionTokenize() {
-        String ccl = "name like (?i:%jeff%)";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("name"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("like")));
-        expectedTokens.add(new ValueSymbol(
-                COMPILER_PARSE_VALUE_FUNCTION.apply("(?i:%jeff%)")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleConjunctionTokenize() {
-        String ccl = "a = 1 and b = 2";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleDisjunctionTokenize() {
-        String ccl = "a = 1 or b = 2";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testDoubleConjunctionTokenize() {
-        String ccl = "a = 1 and b = 2 and c = 3";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testDoubleDisjunctionTokenize() {
-        String ccl = "a = 1 or b = 2 or c = 3";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testConjunctionDisjunctionTokenize() {
-        String ccl = "a = 1 and b = 2 or c = 3";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testDisjunctionConjunctionTokenize() {
-        String ccl = "a = 1 or b = 2 and c = 3";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testDisjunctionParenthesizedConjunctionTokenize() {
-        String ccl = "a = 1 and (b = 2 or c = 3)";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(ParenthesisSymbol.LEFT);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3")));
-        expectedTokens.add(ParenthesisSymbol.RIGHT);
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleConjunctionPostFix() {
-        String ccl = "a = 1 and b = 2";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        ConditionTree tree = (ConditionTree) ast;
-        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testSingleDisjunctionPostFix() {
-        String ccl = "a = 1 or b = 2";
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Queue<PostfixNotationSymbol> order = compiler
-                .arrange((ConditionTree) ast);
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testDoubleConjunctionPostFix() {
-        String ccl = "a = 1 and b = 2 and c = 3";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        ConditionTree tree = (ConditionTree) ast;
-        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testDoubleDisjunctionPostFix() {
-        String ccl = "a = 1 or b = 2 or c = 3";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        ConditionTree tree = (ConditionTree) ast;
-        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testConjunctionDisjunctionPostFix() {
-        String ccl = "a = 1 and b = 2 or c = 3";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        ConditionTree tree = (ConditionTree) ast;
-        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testDisjunctionConjunctionPostFix() {
-        String ccl = "a = 1 or b = 2 and c = 3";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        ConditionTree tree = (ConditionTree) ast;
-        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testDisjunctionParenthesizedConjunctionPostFix() {
-        String ccl = "a = 1 or (b = 2 and c = 3)";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                COMPILER_PARSE_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        ConditionTree tree = (ConditionTree) ast;
-        Queue<PostfixNotationSymbol> order = compiler.arrange(tree);
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testSingleExpressionAbstractSyntaxTree() {
-        String ccl = "a = 1";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("a", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("1", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testSingleBinaryExpressionAbstractSyntaxTree() {
-        String ccl = "a >< 1 2";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("a", expression.key().toString());
-        Assert.assertEquals("><", expression.operator().toString());
-        Assert.assertEquals("1", expression.values().get(0).toString());
-        Assert.assertEquals("2", expression.values().get(1).toString());
-    }
-
-    @Test
-    public void testSingleConjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 and b = 2";
-
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ConjunctionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (((ConjunctionTree) tree)
-                .right()).root();
-        Assert.assertEquals("b", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("2", rightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testSingleDisjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 or b = 2";
-
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof OrTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // Left node
-        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
-                .root();
-        Assert.assertEquals("a", leftExpression.key().toString());
-        Assert.assertEquals("=", leftExpression.operator().toString());
-        Assert.assertEquals("1", leftExpression.values().get(0).toString());
-
-        // Right node
-        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
-                .root();
-        Assert.assertEquals("b", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("2", rightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDoubleConjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 and b = 2 and c = 3";
-
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof AndTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // left node
-        Assert.assertTrue(rootNode.left() instanceof AndTree);
-        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
-
-        // right node
-        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
-                .root();
-        Assert.assertEquals("c", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("3", rightExpression.values().get(0).toString());
-
-        // Left left node
-        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
-                .left()).root();
-        Assert.assertEquals("a", leftLeftExpression.key().toString());
-        Assert.assertEquals("=", leftLeftExpression.operator().toString());
-        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
-
-        // Left right node
-        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightRightExpression = (ExpressionSymbol) (leftNode
-                .right()).root();
-        Assert.assertEquals("b", rightRightExpression.key().toString());
-        Assert.assertEquals("=", rightRightExpression.operator().toString());
-        Assert.assertEquals("2",
-                rightRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDoubleDisjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 or b = 2 or c = 3";
-
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof OrTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // left node
-        Assert.assertTrue(rootNode.left() instanceof OrTree);
-        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
-
-        // right node
-        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
-                .root();
-        Assert.assertEquals("c", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("3", rightExpression.values().get(0).toString());
-
-        // Left left node
-        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
-                .left()).root();
-        Assert.assertEquals("a", leftLeftExpression.key().toString());
-        Assert.assertEquals("=", leftLeftExpression.operator().toString());
-        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
-
-        // Left right node
-        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
-        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (leftNode
-                .right()).root();
-        Assert.assertEquals("b", leftRightExpression.key().toString());
-        Assert.assertEquals("=", leftRightExpression.operator().toString());
-        Assert.assertEquals("2",
-                leftRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testConjunctionDisjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 and b = 2 or c = 3";
-
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof OrTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // left node
-        Assert.assertTrue(rootNode.left() instanceof AndTree);
-        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
-
-        // right node
-        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
-                .root();
-        Assert.assertEquals("c", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("3", rightExpression.values().get(0).toString());
-
-        // Left left node
-        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
-                .left()).root();
-        Assert.assertEquals("a", leftLeftExpression.key().toString());
-        Assert.assertEquals("=", leftLeftExpression.operator().toString());
-        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
-
-        // Left right node
-        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
-        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (leftNode
-                .right()).root();
-        Assert.assertEquals("b", leftRightExpression.key().toString());
-        Assert.assertEquals("=", leftRightExpression.operator().toString());
-        Assert.assertEquals("2",
-                leftRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDisjunctionConjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 or b = 2 and c = 3";
-
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof OrTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // Right node
-        Assert.assertTrue(rootNode.right() instanceof AndTree);
-        ConjunctionTree rightNode = (ConjunctionTree) rootNode.right();
-
-        // right node
-        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
-                .root();
-        Assert.assertEquals("a", leftExpression.key().toString());
-        Assert.assertEquals("=", leftExpression.operator().toString());
-        Assert.assertEquals("1", leftExpression.values().get(0).toString());
-
-        // Right left node
-        Assert.assertTrue(rightNode.left() instanceof ExpressionTree);
-        ExpressionSymbol rightLeftExpression = (ExpressionSymbol) (rightNode
-                .left()).root();
-        Assert.assertEquals("b", rightLeftExpression.key().toString());
-        Assert.assertEquals("=", rightLeftExpression.operator().toString());
-        Assert.assertEquals("2",
-                rightLeftExpression.values().get(0).toString());
-
-        // Right right node
-        Assert.assertTrue(rightNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightRightExpression = (ExpressionSymbol) (rightNode
-                .right()).root();
-        Assert.assertEquals("c", rightRightExpression.key().toString());
-        Assert.assertEquals("=", rightRightExpression.operator().toString());
-        Assert.assertEquals("3",
-                rightRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDisjunctionParenthesizedConjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 and (b = 2 or c = 3)";
-
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(ast instanceof ConditionTree);
-        Assert.assertTrue(ast instanceof AndTree);
-        ConjunctionTree tree = (ConjunctionTree) ast;
-
-        // Left node
-        Assert.assertTrue(tree.left() instanceof ExpressionTree);
-        ExpressionSymbol leftExpression = (ExpressionSymbol) (tree.left())
-                .root();
-        Assert.assertEquals("a", leftExpression.key().toString());
-        Assert.assertEquals("=", leftExpression.operator().toString());
-        Assert.assertEquals("1", leftExpression.values().get(0).toString());
-
-        // Right node
-        Assert.assertTrue(tree.right() instanceof OrTree);
-        ConjunctionTree rightNode = (ConjunctionTree) tree.right();
-
-        // Right left node
-        Assert.assertTrue(rightNode.left() instanceof ExpressionTree);
-        ExpressionSymbol rightLeftExpression = (ExpressionSymbol) (rightNode
-                .left()).root();
-        Assert.assertEquals("b", rightLeftExpression.key().toString());
-        Assert.assertEquals("=", rightLeftExpression.operator().toString());
-        Assert.assertEquals("2",
-                rightLeftExpression.values().get(0).toString());
-
-        // Right right node
-        Assert.assertTrue(rightNode.right() instanceof ExpressionTree);
-        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (rightNode
-                .right()).root();
-        Assert.assertEquals("c", leftRightExpression.key().toString());
-        Assert.assertEquals("=", leftRightExpression.operator().toString());
-        Assert.assertEquals("3",
-                leftRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testParseCclLocalReferences() {
-        String ccl = "name = $name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl, data);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("\"Lebron James\"",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testEscapedCclLocalReferences() {
-        String ccl = "name = \\$name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl, data);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("$name", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDoubleQuotedValue() {
-        String ccl = "name = \"Javier Lores\"";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("\"Javier Lores\"",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDoubleRightAndLeftQuotedValue() {
-        String ccl = "name = “Javier Lores”";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("\"Javier Lores\"",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testQuotedValueWithinQuotedString() {
-        String ccl = "name = \"Javier \\\"Lores\"";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("'Javier \"Lores'",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testNonQuoteEscapedValueWithinQuoteString() {
-        String ccl = "name = \"Javier \\\"\\@Lores\"";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("'Javier \"\\@Lores'",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void validEscapedLocalResolution() {
-        String ccl = "name = \\$name";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("$name", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void validEscapedImplicitLink() {
-        String ccl = "name = \\@name";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("@name", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testValidLink() {
-        String ccl = "name -> 30";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("LINKS_TO", expression.operator().toString());
-        Assert.assertEquals("30", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void validOperatorEnum() {
-        String ccl = "name LINKS_TO 30";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("LINKS_TO", expression.operator().toString());
-        Assert.assertEquals("30", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testNavigationKey() {
-        String ccl = "mother.children = 3";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("mother.children", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("3", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testLongNavigationKey() {
-        String ccl = "mother.mother.siblings = 3";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("mother.mother.siblings",
-                expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("3", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testPeriodSeparatedValue() {
-        String ccl = "mother = a.b.c";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("mother", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("a.b.c", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testImplicitRecordFunctionAsEvaluationKey() {
-        String ccl = "friends | avg > 3";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertTrue(expression.key() instanceof FunctionKeySymbol);
-        FunctionKeySymbol symbol = expression.key();
-        Assert.assertEquals("avg", symbol.key().operation());
-        Assert.assertEquals("friends", symbol.key().key());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertEquals("3", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testImplicitIndexFunctionAsEvaluationValue() {
-        String ccl = "age > avg(age)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((IndexFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((IndexFunction) expression.values().get(0).value()).key());
-    }
-
-    @Test
-    public void testExplicitFunctionWithSingleRecordAsEvaluationValue() {
-        String ccl = "age > avg(age, 1)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((KeyRecordsFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((KeyRecordsFunction) expression.values().get(0).value())
-                        .key());
-        Assert.assertEquals(1, ((List<Long>) ((KeyRecordsFunction) expression
-                .values().get(0).value()).source()).size());
-        Assert.assertEquals((long) 1,
-                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
-                        .get(0).value()).source()).get(0));
-    }
-
-    @Test
-    public void testExplicitFunctionWithBetween() {
-        String ccl = "age bw avg(age) 1000";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals("><", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((IndexFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((IndexFunction) expression.values().get(0).value()).key());
-
-        Assert.assertEquals("1000", expression.values().get(1).toString());
-    }
-
-    @Test
-    public void testExplicitFunctionWithBetweenCCL() {
-        String ccl = "age bw avg(age, age > 10) 1000";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals("><", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .key());
-
-        Assert.assertTrue(
-                (((KeyConditionFunction) expression.values().get(0).value())
-                        .source()) instanceof ExpressionTree);
-        Assert.assertEquals("age",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).key()
-                                .toString());
-        Assert.assertEquals(">",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).operator()
-                                .toString());
-        Assert.assertEquals("10",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).values()
-                                .get(0).toString());
-
-        Assert.assertEquals("1000", expression.values().get(1).toString());
-    }
-
-    @Test
-    public void testExplicitFunctionWithMultipleRecordsAsEvaluationValue() {
-        String ccl = "age > avg(age, 1, 2)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((KeyRecordsFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((KeyRecordsFunction) expression.values().get(0).value())
-                        .key());
-        Assert.assertEquals(2, ((List<Long>) ((KeyRecordsFunction) expression
-                .values().get(0).value()).source()).size());
-        Assert.assertEquals((long) 1,
-                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
-                        .get(0).value()).source()).get(0));
-        Assert.assertEquals((long) 2,
-                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
-                        .get(0).value()).source()).get(1));
-    }
-
-    @Test
-    public void testExplicitFunctionWithCCLAsEvaluationValue() {
-        String ccl = "age > avg(age, age < 30)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .key());
-
-        Assert.assertTrue(
-                (((KeyConditionFunction) expression.values().get(0).value())
-                        .source()) instanceof ExpressionTree);
-        Assert.assertEquals("age",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).key()
-                                .toString());
-        Assert.assertEquals("<",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).operator()
-                                .toString());
-        Assert.assertEquals("30",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).values()
-                                .get(0).toString());
-    }
-
-    @Test
-    public void testValidImplicitRecordFunctionAsEvaluationKeyAndExplicitFunctionWithCCLAsEvaluationValue() {
-        String ccl = "age | avg > avg(age, age < 30)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertTrue(expression.key() instanceof FunctionKeySymbol);
-        Assert.assertEquals("avg",
-                ((ImplicitKeyRecordFunction) expression.key().key())
-                        .operation());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .key());
-
-        Assert.assertTrue(
-                (((KeyConditionFunction) expression.values().get(0).value())
-                        .source()) instanceof ExpressionTree);
-        Assert.assertEquals("age",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).key()
-                                .toString());
-        Assert.assertEquals("<",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).operator()
-                                .toString());
-        Assert.assertEquals("30",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).values()
-                                .get(0).toString());
-    }
-
-    @Test
-    public void testPageWithNumber() {
-        String input = PAGE + " 3";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new PageSymbol(3, null));
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testPageWithNumberAndSize() {
-        String input = SIZE + " 1 " + PAGE + " 3";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new PageSymbol(3, 1));
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testPageWithSize() {
-        String input = SIZE + " 3";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new PageSymbol(null, 3));
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testPageWithSizeAndNumber() {
-        String input = SIZE + " 1 " + PAGE + " 3";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new PageSymbol(3, 1));
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testPageWithSizeAndNumberAST() {
-        String input = SIZE + " 1 " + PAGE + " 3";
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(input);
-
-        // Root node
-        Assert.assertTrue(tree instanceof PageTree);
-
-        PageSymbol page = (PageSymbol) tree.root();
-        Assert.assertEquals(2, page.offset());
-        Assert.assertEquals(1, page.limit());
-    }
-
-    @Test
-    public void testSingleExpressionTokenizeWithPage() {
-        String ccl = "a = 1 " + SIZE + " 3 " + PAGE + " 1 ";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(new PageSymbol(1, 3));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleExpressionASTWithPage() {
-        String ccl = "a = 1 " + SIZE + " 1 " + PAGE + " 3 ";
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-
-        Assert.assertTrue(rootNode.conditionTree() != null);
-        ConditionTree conditionTree = rootNode.conditionTree();
-
-        Assert.assertTrue(conditionTree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) conditionTree.root();
-        Assert.assertEquals("a", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("1", expression.values().get(0).toString());
-
-        // Page Node
-        Assert.assertTrue(((CommandTree) tree).pageTree() != null);
-        PageSymbol page = (PageSymbol) ((CommandTree) tree).pageTree().root();
-        Assert.assertEquals(2, page.offset());
-        Assert.assertEquals(1, page.limit());
-    }
-
-    @Test
-    public void testJsonReservedIdentifier() {
-        String ccl = "$id$ != 40";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("$id$", expression.key().toString());
-        Assert.assertEquals("!=", expression.operator().toString());
-        Assert.assertEquals("40", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testOrderKey() {
-        String input = ORDER + " age";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                DirectionSymbol.ASCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyAscendingSymbol() {
-        String input = ORDER + " < age";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                DirectionSymbol.ASCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyAscendingWord() {
-        String input = ORDER + " age asc";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                DirectionSymbol.ASCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyDescendingSymbol() {
-        String input = ORDER + " > age";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                DirectionSymbol.DESCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyDescendingWord() {
-        String input = ORDER + " age desc";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                DirectionSymbol.DESCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyWithNumberTimestamp() {
-        String input = ORDER + " age at " + String.valueOf(122L);
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                new TimestampSymbol(122L), DirectionSymbol.ASCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyWithStringTimestamp() {
-        String input = ORDER + " age during \"1992-10-02\"";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                new TimestampSymbol(NaturalLanguage.parseMicros("1992-10-02"),
-                        TimeUnit.DAYS),
-                DirectionSymbol.ASCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyWithNumberTimestampAscending() {
-        String input = ORDER + " < age on " + String.valueOf(122L);
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                new TimestampSymbol(122L), DirectionSymbol.ASCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyWithStringTimestampAscending() {
-        String input = ORDER + " < age during \"1992-10-02\"";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                new TimestampSymbol(NaturalLanguage.parseMicros("1992-10-02"),
-                        TimeUnit.DAYS),
-                DirectionSymbol.ASCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyWithNumberTimestampDescending() {
-        String input = ORDER + " > age during " + String.valueOf(122L);
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                new TimestampSymbol(122L), DirectionSymbol.DESCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderKeyWithStringTimestampDescending() {
-        String input = ORDER + " > age in 1992-10-02";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                new TimestampSymbol(NaturalLanguage.parseMicros("1992-10-02"),
-                        TimeUnit.DAYS),
-                DirectionSymbol.DESCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderMultipleKeys() {
-        String input = ORDER + " age, salary";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                DirectionSymbol.ASCENDING));
-        order.add(new OrderComponentSymbol(new KeySymbol("salary"),
-                DirectionSymbol.ASCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderMultipleKeysWithDirectional() {
-        String input = ORDER + " age asc, salary desc";
-
-        // Build expected list
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("age"),
-                DirectionSymbol.ASCENDING));
-        order.add(new OrderComponentSymbol(new KeySymbol("salary"),
-                DirectionSymbol.DESCENDING));
-        expectedTokens.add(order);
-
-        // Generate list
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderMultipleKeysWithDirectionalAST() {
-        String input = ORDER + " < age, > salary";
-
-        OrderSymbol expectedOrder = new OrderSymbol();
-        expectedOrder.add(new OrderComponentSymbol(new KeySymbol("age"),
-                DirectionSymbol.ASCENDING));
-        expectedOrder.add(new OrderComponentSymbol(new KeySymbol("salary"),
-                DirectionSymbol.DESCENDING));
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(input);
-
-        // Root node
-        Assert.assertTrue(ast instanceof OrderTree);
-
-        // Order Node
-        OrderSymbol order = (OrderSymbol) ((OrderTree) ast).root();
-        Assert.assertEquals(order, expectedOrder);
-    }
-
-    @Test
-    public void testOrderSingleExpressionWithOrderTokenize() {
-        String ccl = "a = 1 " + ORDER + " a";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                COMPILER_PARSE_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens
-                .add(new ValueSymbol(COMPILER_PARSE_VALUE_FUNCTION.apply("1")));
-
-        OrderSymbol order = new OrderSymbol();
-        order.add(new OrderComponentSymbol(new KeySymbol("a"),
-                DirectionSymbol.ASCENDING));
-        expectedTokens.add(order);
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testOrderSingleExpressionWithOrderAbstractSyntaxTree() {
-        String ccl = "a = 1 " + ORDER + " a";
-
-        OrderSymbol expectedOrder = new OrderSymbol();
-        expectedOrder.add(new OrderComponentSymbol(new KeySymbol("a"),
-                DirectionSymbol.ASCENDING));
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-
-        Assert.assertTrue(rootNode.conditionTree() != null);
-        ConditionTree conditionTree = rootNode.conditionTree();
-
-        Assert.assertTrue(conditionTree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) conditionTree.root();
-        Assert.assertEquals("a", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("1", expression.values().get(0).toString());
-
-        // Order Node
-        Assert.assertTrue(((CommandTree) tree).orderTree() != null);
-        OrderSymbol order = (OrderSymbol) ((CommandTree) tree).orderTree()
-                .root();
-        Assert.assertEquals(order, expectedOrder);
-    }
-
-    @Test
-    public void testOrderSingleExpressionWithOrderAndPageAbstractSyntaxTree() {
-        String ccl = "a = 1 " + ORDER + " a " + SIZE + " 1 " + PAGE + " 3";
-
-        OrderSymbol expectedOrder = new OrderSymbol();
-        expectedOrder.add(new OrderComponentSymbol(new KeySymbol("a"),
-                DirectionSymbol.ASCENDING));
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-
-        Assert.assertTrue(rootNode.conditionTree() != null);
-        ConditionTree conditionTree = rootNode.conditionTree();
-
-        Assert.assertTrue(conditionTree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) conditionTree.root();
-        Assert.assertEquals("a", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("1", expression.values().get(0).toString());
-
-        // Order Node
-        Assert.assertTrue(((CommandTree) tree).orderTree() != null);
-        OrderSymbol order = (OrderSymbol) ((CommandTree) tree).orderTree()
-                .root();
-        Assert.assertEquals(order, expectedOrder);
-
-        // Page Node
-        Assert.assertTrue(((CommandTree) tree).pageTree() != null);
-        PageSymbol page = (PageSymbol) ((CommandTree) tree).pageTree().root();
-        Assert.assertEquals(2, page.offset());
-        Assert.assertEquals(1, page.limit());
-    }
-
-    @Test
-    public void testImplicitKeyRecordFunctionTokenize() {
-        String ccl = "age | avg";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new FunctionKeySymbol(
-                new ImplicitKeyRecordFunction("avg", "age")));
-
-        // Generate queue
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        List<Symbol> tokens = compiler.tokenize(ast);
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testImplicitKeyRecordFunctionAbstractSyntaxTree() {
-        String ccl = "age | avg";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof FunctionTree);
-
-        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
-        Assert.assertEquals("age", symbol.function().key());
-        Assert.assertEquals("avg", symbol.function().operation());
-    }
-
-    @Test
-    public void testIndexFunctionAbstractSyntaxTree() {
-        String ccl = "avg(age)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof FunctionTree);
-
-        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
-        Assert.assertEquals(IndexFunction.class, symbol.function().getClass());
-        Assert.assertEquals("age", symbol.function().key());
-        Assert.assertEquals("avg", symbol.function().operation());
-    }
-
-    @Test
-    public void testKeyCclFunctionAbstractSyntaxTree() {
-        String ccl = "avg(age, age > 3)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof FunctionTree);
-        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
-
-        Assert.assertEquals("avg",
-                ((KeyConditionFunction) symbol.function()).operation());
-        Assert.assertEquals("age",
-                ((KeyConditionFunction) symbol.function()).key());
-
-        Assert.assertTrue((((KeyConditionFunction) symbol.function())
-                .source()) instanceof ExpressionTree);
-        Assert.assertEquals("age",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
-                        .function()).source()).root()).key().toString());
-        Assert.assertEquals(">",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
-                        .function()).source()).root()).operator().toString());
-        Assert.assertEquals("3",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
-                        .function()).source()).root()).values().get(0)
-                                .toString());
-    }
-
-    @Test
-    public void testKeyCclFunctionWithTimestampAbstractSyntaxTree() {
-        String ccl = "avg(age, age > 3, in 1992-10-02)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof FunctionTree);
-        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
-
-        Assert.assertEquals("avg",
-                ((KeyConditionFunction) symbol.function()).operation());
-        Assert.assertEquals("age",
-                ((KeyConditionFunction) symbol.function()).key());
-
-        Assert.assertTrue((((KeyConditionFunction) symbol.function())
-                .source()) instanceof ExpressionTree);
-        Assert.assertEquals("age",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
-                        .function()).source()).root()).key().toString());
-        Assert.assertEquals(">",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
-                        .function()).source()).root()).operator().toString());
-        Assert.assertEquals("3",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) symbol
-                        .function()).source()).root()).values().get(0)
-                                .toString());
-        Assert.assertEquals(
-                TimeUnit.DAYS.convert(
-                        ((KeyConditionFunction) symbol.function()).timestamp(),
-                        TimeUnit.MICROSECONDS),
-                TimeUnit.DAYS.convert(NaturalLanguage.parseMicros("1992-10-02"),
-                        TimeUnit.MICROSECONDS));
-    }
-
-    @Test
-    public void testKeyRecordsFunctionAbstractSyntaxTree() {
-        String ccl = "avg(age, 1)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof FunctionTree);
-        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
-
-        Assert.assertEquals("avg",
-                ((KeyRecordsFunction) symbol.function()).operation());
-        Assert.assertEquals("age",
-                ((KeyRecordsFunction) symbol.function()).key());
-
-        Assert.assertEquals(1,
-                ((List<Long>) ((KeyRecordsFunction) symbol.function()).source())
-                        .size());
-        Assert.assertEquals((long) 1,
-                (long) ((List<Long>) ((KeyRecordsFunction) symbol.function())
-                        .source()).get(0));
-    }
-
-    @Test
-    public void testKeyMultiRecordsFunctionAbstractSyntaxTree() {
-        String ccl = "avg(age, 1,2,3,5,11)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof FunctionTree);
-        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
-
-        Assert.assertEquals("avg",
-                ((KeyRecordsFunction) symbol.function()).operation());
-        Assert.assertEquals("age",
-                ((KeyRecordsFunction) symbol.function()).key());
-
-        Assert.assertEquals(5,
-                ((List<Long>) ((KeyRecordsFunction) symbol.function()).source())
-                        .size());
-        Assert.assertEquals((long) 1,
-                (long) ((List<Long>) ((KeyRecordsFunction) symbol.function())
-                        .source()).get(0));
-    }
-
-    @Test
-    public void testKeyMultiRecordsFunctionWithTimestampAbstractSyntaxTree() {
-        String ccl = "avg(age, [1,2,3,5,11], in 1992-10-02)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof FunctionTree);
-        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
-
-        Assert.assertEquals("avg",
-                ((KeyRecordsFunction) symbol.function()).operation());
-        Assert.assertEquals("age",
-                ((KeyRecordsFunction) symbol.function()).key());
-
-        Assert.assertEquals(5,
-                ((List<Long>) ((KeyRecordsFunction) symbol.function()).source())
-                        .size());
-        Assert.assertEquals((long) 1,
-                (long) ((List<Long>) ((KeyRecordsFunction) symbol.function())
-                        .source()).get(0));
-        Assert.assertEquals(
-                TimeUnit.DAYS.convert(
-                        ((KeyRecordsFunction) symbol.function()).timestamp(),
-                        TimeUnit.MICROSECONDS),
-                TimeUnit.DAYS.convert(NaturalLanguage.parseMicros("1992-10-02"),
-                        TimeUnit.MICROSECONDS));
-    }
-
-    @Test
-    public void testIndexFunctionWithTimestampAbstractSyntaxTree() {
-        String ccl = "avg(age, in 1992-10-02)";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof FunctionTree);
-        FunctionTokenSymbol symbol = (FunctionTokenSymbol) tree.root();
-
-        Assert.assertEquals("avg",
-                ((IndexFunction) symbol.function()).operation());
-        Assert.assertEquals("age", ((IndexFunction) symbol.function()).key());
-
-        Assert.assertEquals(
-                TimeUnit.DAYS.convert(
-                        ((IndexFunction) symbol.function()).timestamp(),
-                        TimeUnit.MICROSECONDS),
-                TimeUnit.DAYS.convert(NaturalLanguage.parseMicros("1992-10-02"),
-                        TimeUnit.MICROSECONDS));
-    }
-
-    @Test
-    public void testReproIX5A() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("_")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value("org.internx.model.data.user.Student"))
-                .and()
-                .group(Criteria.where()
-                        .group(Criteria.where().key("group").operator(
-                                com.cinchapi.concourse.thrift.Operator.LIKE)
-                                .value("%Accounting And Business/management%"))
-                        .or()
-                        .group(Criteria.where().key("major").operator(
-                                com.cinchapi.concourse.thrift.Operator.LIKE)
-                                .value("%accounting and business/management%")));
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(criteria.ccl());
-        List<Symbol> tokens = compiler.tokenize(ast);
-        tokens.forEach(token -> {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(String.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        });
-    }
-
-    @Test
-    public void testReproIX5B() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("_")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(Tag
-                                .create("org.internx.model.data.user.Student")))
-                .and()
-                .group(Criteria.where().group(Criteria.where().key("group")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(Tag
-                                .create("Accounting And Business/management")))
-                        .or()
-                        .group(Criteria.where().key("major").operator(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS)
-                                .value(Tag.create(
-                                        "accounting and business/management"))));
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(criteria.ccl());
-        List<Symbol> tokens = compiler.tokenize(ast);
-        tokens.forEach(token -> {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(Tag.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        });
-    }
-
-    @Test
-    public void testRegressionV3_1_1A() {
-        String ccl = "(a = b) or c = d and (email like email.com)";
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        compiler.parse(ccl);
-        Assert.assertTrue(true); // lack of Exception means the test passes
-    }
-
-    /**
-     * Constants
-     */
-    private static final String PAGE = "page";
-    private static final String SIZE = "size";
-    private static final String ORDER = "order by";
-
-    /**
-     * The canonical function to transform strings to java values in a
-     * {@link Parser}.
-     */
-    public final Function<String, Object> COMPILER_PARSE_VALUE_FUNCTION = value -> Convert
-            .stringToJava(value);
-
-    /**
-     * The canonical function to transform strings to operators in a
-     * {@link Parser}.
-     */
-    public final Function<String, Operator> COMPILER_PARSE_OPERATOR_FUNCTION = operator -> Convert
-            .stringToOperator(operator);
-
-    /**
-     *
-     */
-    @SuppressWarnings("unused")
-    private void printPreOrder(AbstractSyntaxTree tree) {
-        System.out.println(tree.root());
-        for (AbstractSyntaxTree child : tree.children()) {
-            printPreOrder(child);
-        }
-    }
-}
-/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.concurrent.TimeUnit;
-
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
-import com.cinchapi.ccl.syntax.CommandTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.DirectionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.OrderComponentSymbol;
-import com.cinchapi.ccl.grammar.OrderSymbol;
-import com.cinchapi.ccl.grammar.ParenthesisSymbol;
-import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.Symbol;
-import com.cinchapi.ccl.grammar.TimestampSymbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.Visitor;
-import com.cinchapi.ccl.util.NaturalLanguage;
-import com.cinchapi.common.reflect.Reflection;
-import com.cinchapi.concourse.Tag;
-import com.cinchapi.concourse.Timestamp;
-import com.cinchapi.concourse.lang.Criteria;
-import com.cinchapi.concourse.thrift.Operator;
-import com.cinchapi.concourse.time.Time;
-import com.cinchapi.concourse.util.Random;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Sets;
-
-/**
- * Unit tests for {@link Compiler} functionality.
- * 
- * @author Jeff Nelson
- */
-public abstract class CompilerTest {
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationAndGroupOr() {
-        doTestAbstractSyntaxTreeGeneration(
-                "graduation_rate > 90 and (percent_undergrad_black >= 5 or total_cost_out_state > 50000)");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationGroupAndOrGroupAnd() {
-        doTestAbstractSyntaxTreeGeneration(
-                "(graduation_rate > 90 and yield_min = 20) or (percent_undergrad_black >= 5 and total_cost_out_state > 50000)");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationGroupOrAndGroupOr() {
-        doTestAbstractSyntaxTreeGeneration(
-                "(graduation_rate > 90 or yield_min = 20) and (percent_undergrad_black >= 5 or total_cost_out_state > 50000)");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationOrGroupAnd() {
-        doTestAbstractSyntaxTreeGeneration(
-                "graduation_rate > 90 or (percent_undergrad_black >= 5 and total_cost_out_state > 50000)");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationSimpleAndOr() {
-        doTestAbstractSyntaxTreeGeneration(
-                "graduation_rate > 90 AND percent_undergrad_black >= 5 OR total_cost_out_of_state > 50000");
-    }
-
-    @Test
-    public void testAbstractSyntaxTreeGenerationSimpleOrAnd() {
-        doTestAbstractSyntaxTreeGeneration(
-                "graduation_rate > 90 OR percent_undergrad_black >= 5 AND total_cost_out_of_state > 50000");
-    }
-
-    @Test
-    public void testGroupAnd() {
-        String key0 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
-        Object value0 = Random.getObject();
-        String key1 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
-        Object value1 = Random.getObject();
-        Criteria criteria = Criteria.where().key(key0).operator(operator0)
-                .value(value0).and().key(key1).operator(operator1).value(value1)
-                .build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
-        ConjunctionSymbol sym = (ConjunctionSymbol) symbols.get(1);
-        ExpressionSymbol exp1 = (ExpressionSymbol) symbols.get(2);
-        Assert.assertEquals(3, symbols.size());
-        Assert.assertEquals(exp0.raw().key(), key0);
-        Assert.assertEquals(exp0.raw().operator(), operator0);
-        Assert.assertEquals(exp0.values().get(0).value(), value0);
-        Assert.assertEquals(sym, ConjunctionSymbol.AND);
-        Assert.assertEquals(exp1.raw().key(), key1);
-        Assert.assertEquals(exp1.raw().operator(), operator1);
-        Assert.assertEquals(exp1.values().get(0).value(), value1);
-    }
-
-    @Test
-    public void testGroupOr() {
-        String key0 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
-        Object value0 = Random.getObject();
-        String key1 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
-        Object value1 = Random.getObject();
-        Criteria criteria = Criteria.where().key(key0).operator(operator0)
-                .value(value0).or().key(key1).operator(operator1).value(value1)
-                .build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
-        ConjunctionSymbol sym = (ConjunctionSymbol) symbols.get(1);
-        ExpressionSymbol exp1 = (ExpressionSymbol) symbols.get(2);
-        Assert.assertEquals(3, symbols.size());
-        Assert.assertEquals(exp0.raw().key(), key0);
-        Assert.assertEquals(exp0.raw().operator(), operator0);
-        Assert.assertEquals(exp0.values().get(0).value(), value0);
-        Assert.assertEquals(sym, ConjunctionSymbol.OR);
-        Assert.assertEquals(exp1.raw().key(), key1);
-        Assert.assertEquals(exp1.raw().operator(), operator1);
-        Assert.assertEquals(exp1.values().get(0).value(), value1);
-    }
-
-    @Test
-    public void testGroupSingle() {
-        String key = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator = com.cinchapi.concourse.thrift.Operator.EQUALS;
-        Object value = Random.getObject();
-        Criteria criteria = Criteria.where().key(key).operator(operator)
-                .value(value).build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp = (ExpressionSymbol) symbols.get(0);
-        Assert.assertEquals(1, symbols.size());
-        Assert.assertEquals(exp.raw().key(), key);
-        Assert.assertEquals(exp.raw().operator(), operator);
-        Assert.assertEquals(exp.values().get(0).value(), value);
-    }
-
-    @Test
-    public void testGroupSingleBetween() {
-        String key = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator = com.cinchapi.concourse.thrift.Operator.BETWEEN;
-        Object value = Random.getObject();
-        Object value1 = Random.getObject();
-        Criteria criteria = Criteria.where().key(key).operator(operator)
-                .value(value).value(value1).build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp = (ExpressionSymbol) symbols.get(0);
-        Assert.assertEquals(1, symbols.size());
-        Assert.assertEquals(exp.raw().key(), key);
-        Assert.assertEquals(exp.raw().operator(), operator);
-        Assert.assertEquals(exp.values().get(0).value(), value);
-        Assert.assertEquals(exp.values().get(1).value(), value1);
-    }
-
-    @Test
-    public void testGroupSub() {
-        String key0 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator0 = com.cinchapi.concourse.thrift.Operator.EQUALS;
-        Object value0 = Random.getObject();
-        String key1 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator1 = com.cinchapi.concourse.thrift.Operator.GREATER_THAN;
-        Object value1 = Random.getObject();
-        String key2 = Random.getString();
-        com.cinchapi.concourse.thrift.Operator operator2 = com.cinchapi.concourse.thrift.Operator.LESS_THAN;
-        Object value2 = Random.getObject();
-        Criteria criteria = Criteria.where().key(key0).operator(operator0)
-                .value(value0).and()
-                .group(Criteria.where().key(key1).operator(operator1)
-                        .value(value1).or().key(key2).operator(operator2)
-                        .value(value2).build())
-                .build();
-        List<Symbol> symbols = Parsing
-                .groupExpressions(Reflection.call(criteria, "symbols"));
-        ExpressionSymbol exp0 = (ExpressionSymbol) symbols.get(0);
-        ConjunctionSymbol sym1 = (ConjunctionSymbol) symbols.get(1);
-        ParenthesisSymbol sym2 = (ParenthesisSymbol) symbols.get(2);
-        ExpressionSymbol exp3 = (ExpressionSymbol) symbols.get(3);
-        ConjunctionSymbol sym4 = (ConjunctionSymbol) symbols.get(4);
-        ExpressionSymbol exp5 = (ExpressionSymbol) symbols.get(5);
-        ParenthesisSymbol sym6 = (ParenthesisSymbol) symbols.get(6);
-        Assert.assertEquals(7, symbols.size());
-        Assert.assertEquals(exp0.raw().key(), key0);
-        Assert.assertEquals(exp0.raw().operator(), operator0);
-        Assert.assertEquals(exp0.values().get(0).value(), value0);
-        Assert.assertEquals(ConjunctionSymbol.AND, sym1);
-        Assert.assertEquals(ParenthesisSymbol.LEFT, sym2);
-        Assert.assertEquals(exp3.raw().key(), key1);
-        Assert.assertEquals(exp3.raw().operator(), operator1);
-        Assert.assertEquals(exp3.values().get(0).value(), value1);
-        Assert.assertEquals(ConjunctionSymbol.OR, sym4);
-        Assert.assertEquals(exp5.raw().key(), key2);
-        Assert.assertEquals(exp5.raw().operator(), operator2);
-        Assert.assertEquals(exp5.values().get(0).value(), value2);
-        Assert.assertEquals(ParenthesisSymbol.RIGHT, sym6);
-    }
-
-    @Test(expected = SyntaxException.class)
-    public void testGroupSyntaxException() {
-        List<Symbol> symbols = Lists.<Symbol> newArrayList(new KeySymbol("foo"),
-                new KeySymbol("bar"));
-        Parsing.groupExpressions(symbols);
-    }
-
-    @Test
-    public void testParseCclAndOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value("1").and().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).or().key("c")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(3).build();
-        String ccl = "a = '1' and b = 2 or c = 3";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-    }
-
-    @Test
-    public void testParseCclBetween() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value("bar").value("baz").build();
-        String ccl = "where foo bw bar baz";
-        String ccl2 = "where foo >< bar baz";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl2)));
-    }
-
-    @Test
-    public void testParseCclBetweenWithBothReferences() {
-        Criteria criteria = Criteria.where().key("age")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value(30).value(35).build();
-        String ccl = "where age bw $age $retireAge";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("retireAge", 35);
-        data.put("team", "Cleveland Cavaliers");
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl, data)));
-    }
-
-    @Test
-    public void testParseCclBetweenWithFirstReference() {
-        Criteria criteria = Criteria.where().key("age")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value(30).value(100).build();
-        String ccl = "where age bw $age 100";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl, data)));
-    }
-
-    @Test
-    public void testParseCclBetweenWithSecondReference() {
-        Criteria criteria = Criteria.where().key("age")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value(5).value(30).build();
-        String ccl = "where age bw 5 $age";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl, data)));
-    }
-
-    @Test
-    public void testParseCCLConjuctionsWithAnd() {
-        String ccl = "name = chandresh pancholi on last christmas day && favovite_player != C. Ronaldo during last year";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        Assert.assertEquals(3, symbols.size());
-        for (int i = 0; i < 2; i++) {
-            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-            Assert.assertTrue(
-                    expr.values().get(0).value().toString().contains(" "));
-            Assert.assertNotEquals(0, expr.raw().timestamp());
-        }
-    }
-
-    @Test
-    public void testParseCclGroupOrAndGroupOr() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .and()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 or b = 2) AND (c = 3 or d = 4)";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-    }
-
-    @Test
-    public void testParseCclGroupOrAndGroupOrConjuctions() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .and()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 || b = 2) && (c = 3 || d = 4)";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-
-    }
-
-    @Test
-    public void testParseCclGroupOrAndGroupOrConjuctionsWithSingleAmpersand() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .and()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 || b = 2) & (c = 3 || d = 4)";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-    }
-
-    @Test
-    public void testParseCclGroupOrOrConjuction() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .or()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 || b = 2) || (c = 3 || d = 4)";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-    }
-
-    @Test
-    public void testParseCclGroupOrOrGroupOr() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .or()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        String ccl = "(a = 1 or b = 2) or (c = 3 or d = 4)";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-    }
-
-    @Test(expected = SyntaxException.class)
-    public void testParseCclInvalidReference() {
-        String ccl = "name = $name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("name", "King James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Compiler compiler = createCompiler();
-        Parsing.toPostfixNotation(compiler.tokenize(compiler.parse(ccl, data)));
-    }
-
-    @Test
-    public void testParseCclLocalReferences() {
-        Criteria criteria = Criteria.where().key("name")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value("Lebron James").build();
-        String ccl = "name = $name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl, data)));
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void testParseCclNoSpaces() {
-        String ccl = "name=jeff";
-        Compiler compiler = createCompiler();
-        compiler.arrange((ConditionTree) compiler.parse(ccl));
-    }
-
-    @Test(expected = SyntaxException.class)
-    public void testParseCclReferenceNotFound() {
-        String ccl = "name = $name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-        Compiler compiler = createCompiler();
-        Parsing.toPostfixNotation(compiler.tokenize(compiler.parse(ccl, data)));
-    }
-
-    @Test
-    public void testParseCclSimple() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value("bar").build();
-        String ccl = "where foo = bar";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-
-    }
-
-    @Test
-    public void testParseCclSimpleAnd() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).build();
-        String ccl = "a = 1 and b = 2";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-    }
-
-    @Test
-    public void testParseCclSimpleOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).or().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).build();
-        String ccl = "a = 1 or b = 2";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-    }
-
-    @Test
-    public void testParseCclTimestampBasicPhrase() {
-        String ccl = "name = jeff at \"now\"";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclTimestampComplexPhrase() {
-        String ccl = "name = jeff at \"last christmas\"";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclTimestampNumericPhrase() {
-        String ccl = "name = jeff at \"" + Time.now() + "\"";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclTimestampPhraseWithoutQuotes() {
-        String ccl = "name = jeff at 3 seconds ago";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclValueAndTimestampPhraseWithoutQuotes() {
-        String ccl = "name = jeff nelson on last christmas day";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertEquals("jeff nelson", expr.values().get(0).value());
-        Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                           // timestamp was
-                                                           // parsed
-    }
-
-    @Test
-    public void testParseCclValueAndTimestampPhraseWithoutQuotesAnd() {
-        String ccl = "name = jeff nelson on last christmas day and favorite_player != Lebron James during last week";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        Assert.assertEquals(3, symbols.size());
-        for (int i = 0; i < 2; ++i) {
-            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-            Assert.assertTrue(
-                    expr.values().get(0).value().toString().contains(" "));
-            Assert.assertNotEquals(0, expr.raw().timestamp()); // this means a
-                                                               // timestamp was
-                                                               // parsed
-        }
-    }
-
-    @Test
-    public void testParseCclValueWithoutQuotes() {
-        String ccl = "name = jeff nelson";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertEquals("jeff nelson", expr.values().get(0).value());
-    }
-
-    @Test
-    public void testParseCclValueWithoutQuotesAnd() {
-        String ccl = "name = jeff nelson and favorite_player != Lebron James";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        Assert.assertEquals(3, symbols.size());
-        for (int i = 0; i < 2; ++i) {
-            ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-            Assert.assertTrue(
-                    expr.values().get(0).value().toString().contains(" "));
-        }
-    }
-
-    @Test
-    public void testParserAnalysisIncludesAllCriteriaKeys() {
-        String ccl = "name = jeff and age = 100 and company = cinchapi or company = blavity";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(Sets.newHashSet("name", "age", "company"),
-                compiler.analyze((ConditionTree) compiler.parse(ccl)).keys());
-    }
-
-    @Test
-    public void testPostfixNotationAndGroupOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and()
-                .group(Criteria.where().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).or().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).build())
-                .build();
-        String ccl = "a = 1 and (b = 2 or c = 3)";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Parsing.toPostfixNotation(Reflection.call(criteria, "symbols")),
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-    }
-
-    @Test
-    public void testReproGH_113() {
-        String ccl = "location = \"Atlanta (HQ)\"";
-        Compiler compiler = createCompiler();
-        Queue<PostfixNotationSymbol> symbols = compiler
-                .arrange((ConditionTree) compiler.parse(ccl));
-        Assert.assertEquals(1, symbols.size());
-        ExpressionSymbol expr = (ExpressionSymbol) symbols.poll();
-        Assert.assertEquals("Atlanta (HQ)", expr.raw().values().get(0));
-    }
-
-    @Test
-    public void testToPostfixNotationAndGroupOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and()
-                .group(Criteria.where().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).or().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).build())
-                .build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 2)),
-                ExpressionSymbol.create(new KeySymbol("c"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(3)));
-        Assert.assertEquals(Iterables.get(pfn, 3), ConjunctionSymbol.OR);
-        Assert.assertEquals(Iterables.get(pfn, 4), ConjunctionSymbol.AND);
-
-    }
-
-    @Test
-    public void testToPostfixNotationAndOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).or().key("c")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(3).build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 5);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.AND);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
-                ExpressionSymbol.create(new KeySymbol("c"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(3)));
-        Assert.assertEquals(Iterables.get(pfn, 4), ConjunctionSymbol.OR);
-    }
-
-    @Test
-    public void testToPostfixNotationGroupOrAndGroupOr() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .and()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
-                ExpressionSymbol.create(new KeySymbol("c"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(3)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 4)),
-                ExpressionSymbol.create(new KeySymbol("d"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(4)));
-        Assert.assertEquals(Iterables.get(pfn, 5), ConjunctionSymbol.OR);
-        Assert.assertEquals(Iterables.get(pfn, 6), ConjunctionSymbol.AND);
-
-    }
-
-    @Test
-    public void testToPostfixNotationGroupOrOrGroupOr() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("a")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(1).or().key("b")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(2).build())
-                .or()
-                .group(Criteria.where().key("c")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(3).or().key("d")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(4).build())
-                .build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 3)),
-                ExpressionSymbol.create(new KeySymbol("c"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(3)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 4)),
-                ExpressionSymbol.create(new KeySymbol("d"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(4)));
-        Assert.assertEquals(Iterables.get(pfn, 5), ConjunctionSymbol.OR);
-        Assert.assertEquals(Iterables.get(pfn, 6), ConjunctionSymbol.OR);
-
-    }
-
-    @Test
-    public void testToPostfixNotationSimple() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value("bar").build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 1);
-        Assert.assertEquals(
-                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).key(),
-                new KeySymbol("foo"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
-                .values().get(0), new ValueSymbol("bar"));
-        Assert.assertEquals(
-                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).operator(),
-                new OperatorSymbol(
-                        com.cinchapi.concourse.thrift.Operator.EQUALS));
-    }
-
-    @Test
-    public void testToPostfixNotationSimpleAnd() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).and().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 3);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.AND);
-    }
-
-    @Test
-    public void testToPostfixNotationSimpleBetween() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(com.cinchapi.concourse.thrift.Operator.BETWEEN)
-                .value("bar").value("baz").build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 1);
-        Assert.assertEquals(
-                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).key(),
-                new KeySymbol("foo"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
-                .values().get(0), new ValueSymbol("bar"));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.getOnlyElement(pfn))
-                .values().get(1), new ValueSymbol("baz"));
-        Assert.assertEquals(
-                ((ExpressionSymbol) Iterables.getOnlyElement(pfn)).operator(),
-                new OperatorSymbol(
-                        com.cinchapi.concourse.thrift.Operator.BETWEEN));
-    }
-
-    @Test
-    public void testToPostfixNotationSimpleOr() {
-        Criteria criteria = Criteria.where().key("a")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(1).or().key("b")
-                .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                .value(2).build();
-        Queue<PostfixNotationSymbol> pfn = Parsing
-                .toPostfixNotation(Reflection.call(criteria, "symbols"));
-        Assert.assertEquals(pfn.size(), 3);
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 0)),
-                ExpressionSymbol.create(new KeySymbol("a"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(1)));
-        Assert.assertEquals(((ExpressionSymbol) Iterables.get(pfn, 1)),
-                ExpressionSymbol.create(new KeySymbol("b"),
-                        new OperatorSymbol(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS),
-                        new ValueSymbol(2)));
-        Assert.assertEquals(Iterables.get(pfn, 2), ConjunctionSymbol.OR);
-    }
-
-    @Test
-    public void testAnalyzeKeysOperator() {
-        String ccl = "name = jeff AND company = Cinchapi and age > 20 or name != bob";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(Sets.newHashSet("name", "company"),
-                compiler.analyze((ConditionTree) compiler.parse(ccl))
-                        .keys(Operator.EQUALS));
-    }
-
-    @Test
-    public void testAnalyzeOperators() {
-        String ccl = "name = jeff AND company = Cinchapi and age > 20 or name != bob";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(
-                Sets.newHashSet(Operator.EQUALS, Operator.GREATER_THAN,
-                        Operator.NOT_EQUALS),
-                compiler.analyze((ConditionTree) compiler.parse(ccl))
-                        .operators());
-    }
-
-    @Test
-    public void testConjunctionPrecedence() {
-        String ccl = "name = jeff OR name = bob AND age > 100";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertEquals(ConjunctionSymbol.OR, ast.root());
-    }
-
-    @Test
-    public void testParseLinksTo() {
-        String ccl1 = "friend lnk2 1";
-        String ccl2 = "friend lnks2 1";
-        String ccl3 = "friend -> 1";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO), compiler
-                .analyze((ConditionTree) compiler.parse(ccl1)).operators());
-        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO), compiler
-                .analyze((ConditionTree) compiler.parse(ccl2)).operators());
-        Assert.assertEquals(Sets.newHashSet(Operator.LINKS_TO), compiler
-                .analyze((ConditionTree) compiler.parse(ccl3)).operators());
-    }
-
-    @Test
-    public void testParseLikeOperator() {
-        String ccl = "email like %gmail%";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals(Sets.newHashSet(Operator.LIKE), compiler
-                .analyze((ConditionTree) compiler.parse(ccl)).operators());
-    }
-
-    @Test
-    public void testTokenizeUnquotedValueStringWithSpace() {
-        Criteria criteria = Criteria.where().key("name")
-                .operator(Operator.EQUALS).value("Jeff Nelson").and()
-                .group(Criteria.where().key("company").operator(Operator.EQUALS)
-                        .value("Cinchapi").or().key("company")
-                        .operator(Operator.EQUALS).value("Blavity"))
-                .build();
-        String ccl = criteria.ccl();
-        Compiler compiler = createCompiler();
-        List<Symbol> symbols = compiler.tokenize(compiler.parse(ccl));
-        Assert.assertEquals(Lists.newArrayList(new KeySymbol("name"),
-                new OperatorSymbol(Operator.EQUALS),
-                new ValueSymbol("Jeff Nelson"), ConjunctionSymbol.AND,
-                ParenthesisSymbol.LEFT, new KeySymbol("company"),
-                new OperatorSymbol(Operator.EQUALS),
-                new ValueSymbol("Cinchapi"), ConjunctionSymbol.OR,
-                new KeySymbol("company"), new OperatorSymbol(Operator.EQUALS),
-                new ValueSymbol("Blavity"), ParenthesisSymbol.RIGHT), symbols);
-    }
-
-    @Test
-    public void testParseSingleQuotedValue() {
-        String ccl = "location = 'Atlanta (HQ)'";
-        Compiler compiler = createCompiler();
-        Assert.assertEquals("Atlanta (HQ)",
-                ((ExpressionSymbol) compiler
-                        .arrange((ConditionTree) compiler.parse(ccl)).poll())
-                                .raw().values().get(0));
-    }
-
-    @Test
-    public void testParseNumericString() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.EQUALS).value("17").build();
-        Compiler compiler = createCompiler();
-        List<Symbol> tokens = compiler.tokenize(compiler.parse(criteria.ccl()));
-        for (Symbol token : tokens) {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(String.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        }
-    }
-
-    @Test
-    public void testParseNumericTag() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.EQUALS).value(Tag.create("17")).build();
-        Compiler compiler = createCompiler();
-        List<Symbol> tokens = compiler.tokenize(compiler.parse(criteria.ccl()));
-        for (Symbol token : tokens) {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(Tag.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        }
-    }
-
-    @Test
-    public void testParseNonNumericTag() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.EQUALS).value(Tag.create("bar")).build();
-        Compiler compiler = createCompiler();
-        List<Symbol> tokens = compiler.tokenize(compiler.parse(criteria.ccl()));
-        for (Symbol token : tokens) {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(Tag.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        }
-    }
-
-    @Test
-    public void testParseNumericNumber() {
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.EQUALS).value(17).build();
-        Compiler compiler = createCompiler();
-        List<Symbol> tokens = compiler.tokenize(compiler.parse(criteria.ccl()));
-        for (Symbol token : tokens) {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(Integer.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        }
-    }
-
-    @Test
-    public void testCriteriaWithTimestampValueParse() {
-        Timestamp start = Timestamp.now();
-        Timestamp end = Timestamp.now();
-        Criteria criteria = Criteria.where().key("foo")
-                .operator(Operator.BETWEEN).value(start).value(end).build();
-        Compiler compiler = createCompiler();
-        int count = 0;
-        for (Symbol symbol : compiler
-                .tokenize(compiler.parse(criteria.ccl()))) {
-            if(symbol instanceof ValueSymbol) {
-                ValueSymbol $symbol = (ValueSymbol) symbol;
-                Assert.assertEquals(Timestamp.class,
-                        $symbol.value().getClass());
-                Assert.assertTrue($symbol.value().equals(start)
-                        || $symbol.value().equals(end));
-                ++count;
-            }
-        }
-        Assert.assertEquals(2, count);
-    }
-
-    @Test
-    public void testParseOrderMultipleKeysWithIndependentDirection() {
-        String ccl = "ORDER BY name ASC, age, email desc";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(3, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
-                new OrderComponentSymbol(new KeySymbol("name"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
-                new OrderComponentSymbol(new KeySymbol("age"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
-                new OrderComponentSymbol(new KeySymbol("email"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.DESCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    @Test
-    public void testParseOrderWithSingleKey() {
-        String ccl = "ORDER BY name";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(1, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList
-                .of(new OrderComponentSymbol(new KeySymbol("name"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    @Test
-    public void testParseOrderWithSingleKeyDirection() {
-        String ccl = "ORDER BY name DESC";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(1, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList
-                .of(new OrderComponentSymbol(new KeySymbol("name"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.DESCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    @Test
-    public void testParseOrderWithSingleKeyTimestamp() {
-        String ccl = "ORDER BY name at last week";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(1, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList
-                .of(new OrderComponentSymbol(new KeySymbol("name"),
-                        new TimestampSymbol(
-                                NaturalLanguage.parseMicros("last week"),
-                                TimeUnit.DAYS),
-                        DirectionSymbol.ASCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    @Test
-    public void testParseOrderWithSingleKeyDirectionTimestamp() {
-        String ccl = "ORDER BY name DESC at last week";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(1, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList
-                .of(new OrderComponentSymbol(new KeySymbol("name"),
-                        new TimestampSymbol(
-                                NaturalLanguage.parseMicros("last week"),
-                                TimeUnit.DAYS),
-                        DirectionSymbol.DESCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    @Test
-    public void testParseOrderWithMultipleKeys() {
-        String ccl = "ORDER BY name, age";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(2, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
-                new OrderComponentSymbol(new KeySymbol("name"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
-                new OrderComponentSymbol(new KeySymbol("age"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    @Test
-    public void testParseOrderWithMultipleKeysBothDirection() {
-        String ccl = "ORDER BY name ASC, age desc";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(2, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
-                new OrderComponentSymbol(new KeySymbol("name"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
-                new OrderComponentSymbol(new KeySymbol("age"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.DESCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    @Test
-    public void testParseOrderWithMultipleKeysBothTimestamp() {
-        String ccl = "ORDER BY name at last week, age at a month ago";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(2, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
-                new OrderComponentSymbol(new KeySymbol("name"),
-                        new TimestampSymbol(
-                                NaturalLanguage.parseMicros("last week"),
-                                TimeUnit.DAYS),
-                        DirectionSymbol.ASCENDING),
-                new OrderComponentSymbol(new KeySymbol("age"),
-                        new TimestampSymbol(
-                                NaturalLanguage.parseMicros("a month ago"),
-                                TimeUnit.DAYS),
-                        DirectionSymbol.ASCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    @Test
-    public void testParseOrderWithMultipleKeysBothDirectionTimestamp() {
-        String ccl = "ORDER BY name desc at last week, age ASC at a month ago";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(2, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
-                new OrderComponentSymbol(new KeySymbol("name"),
-                        new TimestampSymbol(
-                                NaturalLanguage.parseMicros("last week"),
-                                TimeUnit.DAYS),
-                        DirectionSymbol.DESCENDING),
-                new OrderComponentSymbol(new KeySymbol("age"),
-                        new TimestampSymbol(
-                                NaturalLanguage.parseMicros("a month ago"),
-                                TimeUnit.DAYS),
-                        DirectionSymbol.ASCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-
-    @Test
-    public void testParseOrderWithMultipleKeysSomeDirectionTimestamp() {
-        String ccl = "ORDER BY name desc, email, age at a month ago";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        Assert.assertTrue(ast instanceof OrderTree);
-        OrderTree tree = (OrderTree) ast;
-        OrderSymbol symbol = (OrderSymbol) tree.root();
-        Assert.assertEquals(3, symbol.components().size());
-        List<OrderComponentSymbol> expectedComponents = ImmutableList.of(
-                new OrderComponentSymbol(new KeySymbol("name"),
-                        TimestampSymbol.PRESENT,
-                        DirectionSymbol.DESCENDING),
-                new OrderComponentSymbol(new KeySymbol("email"),
-                        TimestampSymbol.PRESENT, DirectionSymbol.ASCENDING),
-                new OrderComponentSymbol(new KeySymbol("age"),
-                        new TimestampSymbol(
-                                NaturalLanguage.parseMicros("a month ago"),
-                                TimeUnit.DAYS),
-                        DirectionSymbol.ASCENDING));
-        for (int i = 0; i < expectedComponents.size(); ++i) {
-            OrderComponentSymbol expected = expectedComponents.get(i);
-            OrderComponentSymbol actual = symbol.components().get(i);
-            Assert.assertEquals(expected, actual);
-        }
-    }
-    
-    @Test
-    public void testParseLikeValueWithWhitespace() {
-        String ccl = "school like %North Carolina%";
-        Compiler compiler = createCompiler();
-        AbstractSyntaxTree ast = compiler.parse(ccl);
-        ExpressionTree expression = (ExpressionTree) ast;
-        ExpressionSymbol symbol = (ExpressionSymbol) expression.root();
-        Assert.assertEquals(new ValueSymbol("%North Carolina%"), symbol.values().iterator().next());
-    }
-
-    protected abstract Compiler createCompiler();
-
-    private void doTestAbstractSyntaxTreeGeneration(String ccl) {
-        Compiler compiler = createCompiler();
-        Visitor<Queue<Symbol>> visitor = new Visitor<Queue<Symbol>>() {
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Queue<Symbol> visit(CommandTree tree, Object... data) {
-                Queue<Symbol> queue = (Queue<Symbol>) data[0];
-                if(tree.children().size() == 2) {
-                    tree.conditionTree().accept(this, data);
-                    tree.pageTree().accept(this, data);
-                    return queue;
-                }
-                else {
-                    tree.conditionTree().accept(this, data);
-                    return queue;
-                }
-            }
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Queue<Symbol> visit(ConjunctionTree tree, Object... data) {
-                Queue<Symbol> queue = (Queue<Symbol>) data[0];
-                tree.left().accept(this, data);
-                tree.right().accept(this, data);
-                queue.add(tree.root());
-                return queue;
-            }
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Queue<Symbol> visit(ExpressionTree tree, Object... data) {
-                Queue<Symbol> queue = (Queue<Symbol>) data[0];
-                queue.add(tree.root());
-                return queue;
-            }
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Queue<Symbol> visit(OrderTree tree, Object... data) {
-                Queue<Symbol> queue = (Queue<Symbol>) data[0];
-                queue.add(tree.root());
-                return queue;
-            }
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Queue<Symbol> visit(PageTree tree, Object... data) {
-                Queue<Symbol> queue = (Queue<Symbol>) data[0];
-                queue.add(tree.root());
-                return queue;
-            }
-
-            @SuppressWarnings("unchecked")
-            @Override
-            public Queue<Symbol> visit(FunctionTree tree,
-                    Object... data) {
-                Queue<Symbol> queue = (Queue<Symbol>) data[0];
-                queue.add(tree.root());
-                return queue;
-            }
-        };
-        Queue<Symbol> queue = compiler.parse(ccl).accept(visitor,
-                new LinkedList<Symbol>());
-        Assert.assertEquals(queue,
-                compiler.arrange((ConditionTree) compiler.parse(ccl)));
-    }
-
-}
-/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl;
-
-import java.util.function.Function;
-
-import com.cinchapi.ccl.type.Operator;
-import com.cinchapi.concourse.util.Convert;
-import com.google.common.collect.Multimap;
-
-/**
- * Abstract implementation of {@link ParserTest}.
- * 
- * @author Jeff Nelson
- * 
- * @deprecated Replaced by {@link AbstractCompilerTest}
- */
-@Deprecated
-public abstract class AbstractParserTest extends ParserTest {
-
-    @Override
-    protected final Parser createParser(String ccl) {
-        return createParser(ccl, (value) -> Convert.stringToJava(value),
-                (operator) -> Convert.stringToOperator(operator));
-    }
-
-    @Override
-    protected final Parser createParser(String ccl,
-            Multimap<String, Object> data) {
-        return createParser(ccl, data, (value) -> Convert.stringToJava(value),
-                (operator) -> Convert.stringToOperator(operator));
-    }
-
-    protected abstract Parser createParser(String ccl,
-            Function<String, Object> valueTransformFunction,
-            Function<String, Operator> operatorTransformFunction);
-
-    protected abstract Parser createParser(String ccl,
-            Multimap<String, Object> data,
-            Function<String, Object> valueTransformFunction,
-            Function<String, Operator> operatorTransformFunction);
-
-}/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl;
-
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.type.Operator;
-import com.cinchapi.common.base.Array;
-import com.cinchapi.concourse.thrift.TObject;
-import com.cinchapi.concourse.util.Convert;
-import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.Multimap;
-
-/**
- * {@link ParserTest} that uses the {@link JavaCCParser}
- * 
- * @author Jeff Nelson
- * @deprecated Replaced by {@link CompilerJavaCCTest}
- */
-@Deprecated
-public class JavaCCParserTest extends AbstractParserTest {
-
-    @Override
-    protected Parser createParser(String ccl,
-            Function<String, Object> valueTransformFunction,
-            Function<String, Operator> operatorTransformFunction) {
-        return Parser.create(ccl, valueTransformFunction,
-                operatorTransformFunction);
-    }
-
-    @Override
-    protected Parser createParser(String ccl, Multimap<String, Object> data,
-            Function<String, Object> valueTransformFunction,
-            Function<String, Operator> operatorTransformFunction) {
-        return Parser.create(ccl, data, valueTransformFunction,
-                operatorTransformFunction);
-    }
-
-    @Test
-    public void testParseCclNoSpaces() {
-        String ccl = "name=jeff";
-        Parser parser = createParser(ccl);
-        parser.order();
-
-        Assert.assertEquals(ExpressionSymbol.create(new KeySymbol("name"),
-                new OperatorSymbol(
-                        com.cinchapi.concourse.thrift.Operator.EQUALS),
-                new ValueSymbol("jeff")), parser.order().peek());
-    }
-
-    @Test
-    public void testLocalEvaluationAnd() {
-        String ccl = "a > 1 AND b bw 10 15";
-        Parser parser = Parser.create(ccl, Convert::stringToJava,
-                Convert::stringToOperator, (value, operator, values) -> {
-                    TObject tvalue = Convert.javaToThrift(value);
-                    TObject[] tvalues = values.stream()
-                            .map(Convert::javaToThrift)
-                            .collect(Collectors.toList())
-                            .toArray(Array.containing());
-                    com.cinchapi.concourse.thrift.Operator toperator = Convert
-                            .stringToOperator(operator.symbol());
-                    return tvalue.is(toperator, tvalues);
-                });
-        Multimap<String, Object> passes = ImmutableMultimap.of("a", 5, "b", 12,
-                "c", 4, "a", -1);
-        Assert.assertTrue(parser.evaluate(passes));
-        Multimap<String, Object> fails = ImmutableMultimap.of("a", 1, "b", 12,
-                "c", 4, "a", -1);
-        Assert.assertFalse(parser.evaluate(fails));
-        Multimap<String, Object> missing = ImmutableMultimap.of("a", 1, "c", 4,
-                "a", -1);
-        Assert.assertFalse(parser.evaluate(missing));
-    }
-
-    @Test
-    public void testLocalEvaluationOr() {
-        String ccl = "a > 1 OR b bw 10 15";
-        Parser parser = Parser.create(ccl, Convert::stringToJava,
-                Convert::stringToOperator, (value, operator, values) -> {
-                    TObject tvalue = Convert.javaToThrift(value);
-                    TObject[] tvalues = values.stream()
-                            .map(Convert::javaToThrift)
-                            .collect(Collectors.toList())
-                            .toArray(Array.containing());
-                    com.cinchapi.concourse.thrift.Operator toperator = Convert
-                            .stringToOperator(operator.symbol());
-                    return tvalue.is(toperator, tvalues);
-                });
-        Multimap<String, Object> a = ImmutableMultimap.of("a", 5, "b", 12, "c",
-                4, "a", -1);
-        Assert.assertTrue(parser.evaluate(a));
-        Multimap<String, Object> b = ImmutableMultimap.of("a", 1, "b", 12, "c",
-                4, "a", -1);
-        Assert.assertTrue(parser.evaluate(b));
-        Multimap<String, Object> c = ImmutableMultimap.of("a", 2, "c", 4, "a",
-                -1);
-        Assert.assertTrue(parser.evaluate(c));
-        Multimap<String, Object> d = ImmutableMultimap.of("a", 1, "c", 4, "a",
-                -1);
-        Assert.assertFalse(parser.evaluate(d));
-    }
-
-}/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl;
-
-import com.cinchapi.ccl.grammar.ConjunctionSymbol;
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.FunctionKeySymbol;
-import com.cinchapi.ccl.grammar.FunctionValueSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.ParenthesisSymbol;
-import com.cinchapi.ccl.grammar.PostfixNotationSymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.Symbol;
-import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
-import com.cinchapi.ccl.syntax.AndTree;
-import com.cinchapi.ccl.syntax.ConjunctionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.OrTree;
-import com.cinchapi.ccl.type.Operator;
-import com.cinchapi.ccl.type.function.IndexFunction;
-import com.cinchapi.ccl.type.function.KeyConditionFunction;
-import com.cinchapi.ccl.type.function.KeyRecordsFunction;
-import com.cinchapi.ccl.type.function.ImplicitKeyRecordFunction;
-import com.cinchapi.concourse.Tag;
-import com.cinchapi.concourse.lang.Criteria;
-import com.cinchapi.concourse.util.Convert;
-import com.google.common.collect.LinkedHashMultimap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Multimap;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Queue;
-import java.util.function.Function;
-
-/**
- * Tests for {@link JavaCCParser}.
- *
- * These tests include utput tests (postfix, abstract
- * syntax tree, tokens)
- * 
- * @deprecated Replaced by {@link CompilerJavaCCLogicTest}
- */
-@Deprecated
-public class JavaCCParserLogicTest {
-
-    @Test
-    public void testSingleExpressionTokenize() {
-        String ccl = "a = 1";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleBinaryExpressionTokenize() {
-        String ccl = "a >< 1 3";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("><")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleNRegexExpressionTokenize() {
-        String ccl = "name nregex (?i:%jeff%)";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("name"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("nregex")));
-        expectedTokens.add(new ValueSymbol(
-                PARSER_TRANSFORM_VALUE_FUNCTION.apply("(?i:%jeff%)")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleLikeExpressionTokenize() {
-        String ccl = "name like (?i:%jeff%)";
-
-        // Build expected queue
-        List<Object> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("name"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("like")));
-        expectedTokens.add(new ValueSymbol(
-                PARSER_TRANSFORM_VALUE_FUNCTION.apply("(?i:%jeff%)")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-
-        List<Symbol> tokens = parser.tokenize();
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleConjunctionTokenize() {
-        String ccl = "a = 1 and b = 2";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleDisjunctionTokenize() {
-        String ccl = "a = 1 or b = 2";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testDoubleConjunctionTokenize() {
-        String ccl = "a = 1 and b = 2 and c = 3";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testDoubleDisjunctionTokenize() {
-        String ccl = "a = 1 or b = 2 or c = 3";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testConjunctionDisjunctionTokenize() {
-        String ccl = "a = 1 and b = 2 or c = 3";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testDisjunctionConjunctionTokenize() {
-        String ccl = "a = 1 or b = 2 and c = 3";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testDisjunctionParenthesizedConjunctionTokenize() {
-        String ccl = "a = 1 and (b = 2 or c = 3)";
-
-        // Build expected queue
-        List<Symbol> expectedTokens = Lists.newArrayList();
-
-        expectedTokens.add(new KeySymbol("a"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("1")));
-        expectedTokens.add(ConjunctionSymbol.AND);
-        expectedTokens.add(ParenthesisSymbol.LEFT);
-        expectedTokens.add(new KeySymbol("b"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2")));
-        expectedTokens.add(ConjunctionSymbol.OR);
-        expectedTokens.add(new KeySymbol("c"));
-        expectedTokens.add(new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("=")));
-        expectedTokens.add(
-                new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3")));
-        expectedTokens.add(ParenthesisSymbol.RIGHT);
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        List<Symbol> tokens = parser.tokenize();
-
-        Assert.assertEquals(expectedTokens, tokens);
-    }
-
-    @Test
-    public void testSingleConjunctionPostFix() {
-        String ccl = "a = 1 and b = 2";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        Queue<PostfixNotationSymbol> order = parser.order();
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testSingleDisjunctionPostFix() {
-        String ccl = "a = 1 or b = 2";
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        Queue<PostfixNotationSymbol> order = parser.order();
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testDoubleConjunctionPostFix() {
-        String ccl = "a = 1 and b = 2 and c = 3";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        Queue<PostfixNotationSymbol> order = parser.order();
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testDoubleDisjunctionPostFix() {
-        String ccl = "a = 1 or b = 2 or c = 3";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        Queue<PostfixNotationSymbol> order = parser.order();
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testConjunctionDisjunctionPostFix() {
-        String ccl = "a = 1 and b = 2 or c = 3";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        Queue<PostfixNotationSymbol> order = parser.order();
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testDisjunctionConjunctionPostFix() {
-        String ccl = "a = 1 or b = 2 and c = 3";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        Queue<PostfixNotationSymbol> order = parser.order();
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testDisjunctionParenthesizedConjunctionPostFix() {
-        String ccl = "a = 1 or (b = 2 and c = 3)";
-
-        // Build expected queue
-        Queue<PostfixNotationSymbol> expectedOrder = new LinkedList<>();
-
-        KeySymbol key = new KeySymbol("a");
-        OperatorSymbol operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        ValueSymbol value = new ValueSymbol(
-                PARSER_TRANSFORM_VALUE_FUNCTION.apply("1"));
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("b");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("2"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        key = new KeySymbol("c");
-        operator = new OperatorSymbol(
-                PARSER_TRANSFORM_OPERATOR_FUNCTION.apply("="));
-        value = new ValueSymbol(PARSER_TRANSFORM_VALUE_FUNCTION.apply("3"));
-        expression = ExpressionSymbol.create(key, operator, value);
-        expectedOrder.add(expression);
-
-        expectedOrder.add(ConjunctionSymbol.AND);
-        expectedOrder.add(ConjunctionSymbol.OR);
-
-        // Generate queue
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        Queue<PostfixNotationSymbol> order = parser.order();
-
-        Assert.assertEquals(expectedOrder, order);
-    }
-
-    @Test
-    public void testSingleExpressionAbstractSyntaxTree() {
-        String ccl = "a = 1";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("a", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("1", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testSingleBinaryExpressionAbstractSyntaxTree() {
-        String ccl = "a >< 1 2";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("a", expression.key().toString());
-        Assert.assertEquals("><", expression.operator().toString());
-        Assert.assertEquals("1", expression.values().get(0).toString());
-        Assert.assertEquals("2", expression.values().get(1).toString());
-    }
-
-    @Test
-    public void testSingleConjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 and b = 2";
-
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof AndTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // Left node
-        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
-                .root();
-        Assert.assertEquals("a", leftExpression.key().toString());
-        Assert.assertEquals("=", leftExpression.operator().toString());
-        Assert.assertEquals("1", leftExpression.values().get(0).toString());
-
-        // Right node
-        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
-                .root();
-        Assert.assertEquals("b", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("2", rightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testSingleDisjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 or b = 2";
-
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof OrTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // Left node
-        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
-                .root();
-        Assert.assertEquals("a", leftExpression.key().toString());
-        Assert.assertEquals("=", leftExpression.operator().toString());
-        Assert.assertEquals("1", leftExpression.values().get(0).toString());
-
-        // Right node
-        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
-                .root();
-        Assert.assertEquals("b", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("2", rightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDoubleConjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 and b = 2 and c = 3";
-
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof AndTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // left node
-        Assert.assertTrue(rootNode.left() instanceof AndTree);
-        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
-
-        // right node
-        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
-                .root();
-        Assert.assertEquals("c", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("3", rightExpression.values().get(0).toString());
-
-        // Left left node
-        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
-                .left()).root();
-        Assert.assertEquals("a", leftLeftExpression.key().toString());
-        Assert.assertEquals("=", leftLeftExpression.operator().toString());
-        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
-
-        // Left right node
-        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightRightExpression = (ExpressionSymbol) (leftNode
-                .right()).root();
-        Assert.assertEquals("b", rightRightExpression.key().toString());
-        Assert.assertEquals("=", rightRightExpression.operator().toString());
-        Assert.assertEquals("2",
-                rightRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDoubleDisjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 or b = 2 or c = 3";
-
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof OrTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // left node
-        Assert.assertTrue(rootNode.left() instanceof OrTree);
-        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
-
-        // right node
-        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
-                .root();
-        Assert.assertEquals("c", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("3", rightExpression.values().get(0).toString());
-
-        // Left left node
-        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
-                .left()).root();
-        Assert.assertEquals("a", leftLeftExpression.key().toString());
-        Assert.assertEquals("=", leftLeftExpression.operator().toString());
-        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
-
-        // Left right node
-        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
-        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (leftNode
-                .right()).root();
-        Assert.assertEquals("b", leftRightExpression.key().toString());
-        Assert.assertEquals("=", leftRightExpression.operator().toString());
-        Assert.assertEquals("2",
-                leftRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testConjunctionDisjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 and b = 2 or c = 3";
-
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof OrTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // left node
-        Assert.assertTrue(rootNode.left() instanceof AndTree);
-        ConjunctionTree leftNode = (ConjunctionTree) rootNode.left();
-
-        // right node
-        Assert.assertTrue(rootNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightExpression = (ExpressionSymbol) (rootNode.right())
-                .root();
-        Assert.assertEquals("c", rightExpression.key().toString());
-        Assert.assertEquals("=", rightExpression.operator().toString());
-        Assert.assertEquals("3", rightExpression.values().get(0).toString());
-
-        // Left left node
-        Assert.assertTrue(leftNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftLeftExpression = (ExpressionSymbol) (leftNode
-                .left()).root();
-        Assert.assertEquals("a", leftLeftExpression.key().toString());
-        Assert.assertEquals("=", leftLeftExpression.operator().toString());
-        Assert.assertEquals("1", leftLeftExpression.values().get(0).toString());
-
-        // Left right node
-        Assert.assertTrue(leftNode.right() instanceof ExpressionTree);
-        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (leftNode
-                .right()).root();
-        Assert.assertEquals("b", leftRightExpression.key().toString());
-        Assert.assertEquals("=", leftRightExpression.operator().toString());
-        Assert.assertEquals("2",
-                leftRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDisjunctionConjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 or b = 2 and c = 3";
-
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof OrTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // Right node
-        Assert.assertTrue(rootNode.right() instanceof AndTree);
-        ConjunctionTree rightNode = (ConjunctionTree) rootNode.right();
-
-        // right node
-        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
-                .root();
-        Assert.assertEquals("a", leftExpression.key().toString());
-        Assert.assertEquals("=", leftExpression.operator().toString());
-        Assert.assertEquals("1", leftExpression.values().get(0).toString());
-
-        // Right left node
-        Assert.assertTrue(rightNode.left() instanceof ExpressionTree);
-        ExpressionSymbol rightLeftExpression = (ExpressionSymbol) (rightNode
-                .left()).root();
-        Assert.assertEquals("b", rightLeftExpression.key().toString());
-        Assert.assertEquals("=", rightLeftExpression.operator().toString());
-        Assert.assertEquals("2",
-                rightLeftExpression.values().get(0).toString());
-
-        // Right right node
-        Assert.assertTrue(rightNode.right() instanceof ExpressionTree);
-        ExpressionSymbol rightRightExpression = (ExpressionSymbol) (rightNode
-                .right()).root();
-        Assert.assertEquals("c", rightRightExpression.key().toString());
-        Assert.assertEquals("=", rightRightExpression.operator().toString());
-        Assert.assertEquals("3",
-                rightRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDisjunctionParenthesizedConjunctionAbstractSyntaxTree() {
-        String ccl = "a = 1 and (b = 2 or c = 3)";
-
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof AndTree);
-        ConjunctionTree rootNode = (ConjunctionTree) tree;
-
-        // Left node
-        Assert.assertTrue(rootNode.left() instanceof ExpressionTree);
-        ExpressionSymbol leftExpression = (ExpressionSymbol) (rootNode.left())
-                .root();
-        Assert.assertEquals("a", leftExpression.key().toString());
-        Assert.assertEquals("=", leftExpression.operator().toString());
-        Assert.assertEquals("1", leftExpression.values().get(0).toString());
-
-        // Right node
-        Assert.assertTrue(rootNode.right() instanceof OrTree);
-        ConjunctionTree rightNode = (ConjunctionTree) rootNode.right();
-
-        // Right left node
-        Assert.assertTrue(rightNode.left() instanceof ExpressionTree);
-        ExpressionSymbol rightLeftExpression = (ExpressionSymbol) (rightNode
-                .left()).root();
-        Assert.assertEquals("b", rightLeftExpression.key().toString());
-        Assert.assertEquals("=", rightLeftExpression.operator().toString());
-        Assert.assertEquals("2",
-                rightLeftExpression.values().get(0).toString());
-
-        // Right right node
-        Assert.assertTrue(rightNode.right() instanceof ExpressionTree);
-        ExpressionSymbol leftRightExpression = (ExpressionSymbol) (rightNode
-                .right()).root();
-        Assert.assertEquals("c", leftRightExpression.key().toString());
-        Assert.assertEquals("=", leftRightExpression.operator().toString());
-        Assert.assertEquals("3",
-                leftRightExpression.values().get(0).toString());
-    }
-
-    @Test
-    public void testParseCclLocalReferences() {
-        String ccl = "name = $name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, data,
-                PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("\"Lebron James\"",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testEscapedCclLocalReferences() {
-        String ccl = "name = \\$name";
-        Multimap<String, Object> data = LinkedHashMultimap.create();
-        data.put("name", "Lebron James");
-        data.put("age", 30);
-        data.put("team", "Cleveland Cavaliers");
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, data,
-                PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("$name", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDoubleQuotedValue() {
-        String ccl = "name = \"Javier Lores\"";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("\"Javier Lores\"",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testDoubleRightAndLeftQuotedValue() {
-        String ccl = "name = “Javier Lores”";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("\"Javier Lores\"",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testQuotedValueWithinQuotedString() {
-        String ccl = "name = \"Javier \\\"Lores\"";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("'Javier \"Lores'",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testNonQuoteEscapedValueWithinQuoteString() {
-        String ccl = "name = \"Javier \\\"\\@Lores\"";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("'Javier \"\\@Lores'",
-                expression.values().get(0).toString());
-    }
-
-    @Test
-    public void validEscapedLocalResolution() {
-        String ccl = "name = \\$name";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("$name", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void validEscapedImplicitLink() {
-        String ccl = "name = \\@name";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("@name", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void validLink() {
-        String ccl = "name -> 30";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("LINKS_TO", expression.operator().toString());
-        Assert.assertEquals("30", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void validOperatorEnum() {
-        String ccl = "name LINKS_TO 30";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("name", expression.key().toString());
-        Assert.assertEquals("LINKS_TO", expression.operator().toString());
-        Assert.assertEquals("30", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testNavigationKey() {
-        String ccl = "mother.children = 3";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("mother.children", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("3", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testLongNavigationKey() {
-        String ccl = "mother.mother.siblings = 3";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("mother.mother.siblings",
-                expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("3", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testPeriodSeparatedValue() {
-        String ccl = "mother = a.b.c";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("mother", expression.key().toString());
-        Assert.assertEquals("=", expression.operator().toString());
-        Assert.assertEquals("a.b.c", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testImplicitRecordFunctionAsEvaluationKey() {
-        String ccl = "friends | avg > 3";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertTrue(expression.key() instanceof FunctionKeySymbol);
-        FunctionKeySymbol symbol = expression.key();
-        Assert.assertEquals("avg", symbol.key().operation());
-        Assert.assertEquals("friends", symbol.key().key());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertEquals("3", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testImplicitIndexFunctionAsEvaluationValue() {
-        String ccl = "age > avg(age)";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((IndexFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((IndexFunction) expression.values().get(0).value()).key());
-    }
-
-    @Test
-    public void testExplicitFunctionWithSingleRecordAsEvaluationValue() {
-        String ccl = "age > avg(age, 1)";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((KeyRecordsFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((KeyRecordsFunction) expression.values().get(0).value())
-                        .key());
-        Assert.assertEquals(1, ((List<Long>) ((KeyRecordsFunction) expression
-                .values().get(0).value()).source()).size());
-        Assert.assertEquals((long) 1,
-                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
-                        .get(0).value()).source()).get(0));
-    }
-
-    @Test
-    public void testExplicitFunctionWithBetween() {
-        String ccl = "age bw avg(age) 1000";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals("><", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((IndexFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((IndexFunction) expression.values().get(0).value()).key());
-
-        Assert.assertEquals("1000", expression.values().get(1).toString());
-    }
-
-    @Test
-    public void testExplicitFunctionWithBetweenCCL() {
-        String ccl = "age bw avg(age, age > 10) 1000";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals("><", expression.operator().toString());
-        KeyConditionFunction function = (KeyConditionFunction) expression
-                .values().get(0).value();
-        Assert.assertTrue(function.source() instanceof ExpressionTree);
-        ExpressionTree t = (ExpressionTree) function.source();
-        ExpressionSymbol root = (ExpressionSymbol) t.root();
-        Assert.assertEquals("age", root.key().key());
-        Assert.assertEquals(">", root.operator().operator().symbol());
-        Assert.assertEquals(10, root.values().get(0).value());
-
-        Assert.assertEquals("1000", expression.values().get(1).toString());
-    }
-
-    @Test
-    public void testExplicitFunctionWithMultipleRecordsAsEvaluationValue() {
-        String ccl = "age > avg(age, 1, 2)";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((KeyRecordsFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((KeyRecordsFunction) expression.values().get(0).value())
-                        .key());
-        Assert.assertEquals(2, ((List<Long>) ((KeyRecordsFunction) expression
-                .values().get(0).value()).source()).size());
-        Assert.assertEquals((long) 1,
-                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
-                        .get(0).value()).source()).get(0));
-        Assert.assertEquals((long) 2,
-                (long) ((List<Long>) ((KeyRecordsFunction) expression.values()
-                        .get(0).value()).source()).get(1));
-    }
-
-    @Test
-    public void testExplicitFunctionWithCCLAsEvaluationValue() {
-        String ccl = "age > avg(age, age < 30)";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("age", expression.key().toString());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .key());
-
-        Assert.assertTrue(
-                (((KeyConditionFunction) expression.values().get(0).value())
-                        .source()) instanceof ExpressionTree);
-        Assert.assertEquals("age",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).key()
-                                .toString());
-        Assert.assertEquals("<",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).operator()
-                                .toString());
-        Assert.assertEquals("30",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).values()
-                                .get(0).toString());
-    }
-
-    @Test
-    public void validImplicitRecordFunctionAsEvaluationKeyAndExplicitFunctionWithCCLAsEvaluationValue() {
-        String ccl = "age | avg > avg(age, age < 30)";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertTrue(expression.key() instanceof FunctionKeySymbol);
-        Assert.assertEquals("avg",
-                ((ImplicitKeyRecordFunction) expression.key().key())
-                        .operation());
-        Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertTrue(
-                expression.values().get(0) instanceof FunctionValueSymbol);
-        Assert.assertEquals("avg",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .operation());
-        Assert.assertEquals("age",
-                ((KeyConditionFunction) expression.values().get(0).value())
-                        .key());
-
-        Assert.assertTrue(
-                (((KeyConditionFunction) expression.values().get(0).value())
-                        .source()) instanceof ExpressionTree);
-        Assert.assertEquals("age",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).key()
-                                .toString());
-        Assert.assertEquals("<",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).operator()
-                                .toString());
-        Assert.assertEquals("30",
-                ((ExpressionSymbol) ((AbstractSyntaxTree) ((KeyConditionFunction) expression
-                        .values().get(0).value()).source()).root()).values()
-                                .get(0).toString());
-    }
-
-    @Test
-    public void testJsonReservedIdentifier() {
-        String ccl = "$id$ != 40";
-
-        // Generate tree
-        Parser parser = Parser.create(ccl, PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = parser.parse();
-
-        // Root node
-        Assert.assertTrue(tree instanceof ExpressionTree);
-        ExpressionSymbol expression = (ExpressionSymbol) tree.root();
-        Assert.assertEquals("$id$", expression.key().toString());
-        Assert.assertEquals("!=", expression.operator().toString());
-        Assert.assertEquals("40", expression.values().get(0).toString());
-    }
-
-    @Test
-    public void testReproIX5A() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("_")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value("org.internx.model.data.user.Student"))
-                .and()
-                .group(Criteria.where()
-                        .group(Criteria.where().key("group").operator(
-                                com.cinchapi.concourse.thrift.Operator.LIKE)
-                                .value("%Accounting And Business/management%"))
-                        .or()
-                        .group(Criteria.where().key("major").operator(
-                                com.cinchapi.concourse.thrift.Operator.LIKE)
-                                .value("%accounting and business/management%")));
-
-        // Generate tree
-        Parser parser = Parser.create(criteria.ccl(),
-                PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        parser.tokenize().forEach(token -> {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(String.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        });
-    }
-
-    @Test
-    public void testReproIX5B() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("_")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(Tag
-                                .create("org.internx.model.data.user.Student")))
-                .and()
-                .group(Criteria.where().group(Criteria.where().key("group")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value(Tag
-                                .create("Accounting And Business/management")))
-                        .or()
-                        .group(Criteria.where().key("major").operator(
-                                com.cinchapi.concourse.thrift.Operator.EQUALS)
-                                .value(Tag.create(
-                                        "accounting and business/management"))));
-
-        // Generate tree
-        Parser parser = Parser.create(criteria.ccl(),
-                PARSER_TRANSFORM_VALUE_FUNCTION,
-                PARSER_TRANSFORM_OPERATOR_FUNCTION);
-        parser.tokenize().forEach(token -> {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(Tag.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        });
-    }
-
-    /**
-     * The canonical function to transform strings to java values in a
-     * {@link Parser}.
-     */
-    public final Function<String, Object> PARSER_TRANSFORM_VALUE_FUNCTION = value -> Convert
-            .stringToJava(value);
-
-    /**
-     * The canonical function to transform strings to operators in a
-     * {@link Parser}.
-     */
-    public final Function<String, Operator> PARSER_TRANSFORM_OPERATOR_FUNCTION = operator -> Convert
-            .stringToOperator(operator);
-
-    /**
-     *
-     */
-    @SuppressWarnings("unused")
-    private void printPreOrder(AbstractSyntaxTree tree) {
-        System.out.println(tree.root());
-        for (AbstractSyntaxTree child : tree.children()) {
-            printPreOrder(child);
-        }
-    }
-}/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl;
-
-import java.util.function.Function;
-
-import com.cinchapi.ccl.type.Operator;
-import com.cinchapi.concourse.util.Convert;
-
-/**
- * Abstract implementation of {@link CompilerTest}.
- * 
- * @author Jeff Nelson
- */
-public abstract class AbstractCompilerTest extends CompilerTest {
-
-    @Override
-    protected final Compiler createCompiler() {
-        return createCompiler((value) -> Convert.stringToJava(value),
-                (operator) -> Convert.stringToOperator(operator));
-    }
-    
-    protected abstract Compiler createCompiler(
-            Function<String, Object> valueTransformFunction,
-            Function<String, Operator> operatorTransformFunction);
-}
-/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.cinchapi.ccl.syntax;
-
-import com.cinchapi.ccl.grammar.ExpressionSymbol;
-import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.OperatorSymbol;
-import com.cinchapi.ccl.grammar.ValueSymbol;
-import com.cinchapi.ccl.grammar.KeySymbol;
-import com.cinchapi.ccl.grammar.ValueTokenSymbol;
-import com.cinchapi.concourse.thrift.Operator;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * Tests for the {@link Visitor} interface
- */
-public class VisitorTest {
-
-    @Test
-    public void testVisitorPattern() {
-        // Build tree
-        KeyTokenSymbol<String> key = new KeySymbol("key");
-        OperatorSymbol operator = new OperatorSymbol(Operator.EQUALS);
-        ValueTokenSymbol<Object> value = new ValueSymbol("value");
-
-        ExpressionSymbol expression = ExpressionSymbol.create(key, operator,
-                value);
-        ExpressionTree leftTree = new ExpressionTree(expression);
-
-        key = new KeySymbol("key");
-        operator = new OperatorSymbol(Operator.EQUALS);
-        value = new ValueSymbol("value");
-
-        expression = ExpressionSymbol.create(key, operator, value);
-        ExpressionTree rightTree = new ExpressionTree(expression);
-
-        AndTree tree = new AndTree(leftTree, rightTree);
-
-        // Test visitor
-        Visitor<Object> visitor = new Visitor<Object>() {
-            @Override
-            public Object visit(CommandTree tree, Object... data) {
-                return data;
-            }
-
-            @Override
-            public Object visit(ConjunctionTree tree, Object... data) {
-                Assert.assertTrue(tree instanceof AndTree);
-                return data;
-            }
-
-            @Override
-            public Object visit(ExpressionTree tree, Object... data) {
-                Assert.assertTrue(((ExpressionSymbol) tree.root()).key()
-                        .toString().equals("key"));
-                Assert.assertTrue(((ExpressionSymbol) tree.root()).operator()
-                        .toString().equals("="));
-                Assert.assertTrue(((ExpressionSymbol) tree.root()).values()
-                        .get(0).toString().equals("value"));
-                return data;
-            }
-
-            @Override
-            public Object visit(PageTree tree, Object... data) {
-                return data;
-            }
-
-            @Override
-            public Object visit(OrderTree tree, Object... data) {
-                return data;
-            }
-
-            @Override
-            public Object visit(FunctionTree tree, Object... data) {
-                return data;
-            }
-
-        };
-        tree.accept(visitor);
-    }
-
-}

From cf765abe7ca704819de9936f907e2179aa59700f Mon Sep 17 00:00:00 2001
From: Javier Lores <lores.javier@gmail.com>
Date: Tue, 28 Jan 2025 07:55:17 -0500
Subject: [PATCH 4/9] Fixed grammar and added tests

---
 grammar/grammar.jjt                           |   97 +-
 src/main/java/com/cinchapi/ccl/Compiler.java  |    3 +-
 .../java/com/cinchapi/ccl/CompilerJavaCC.java |   32 +-
 .../com/cinchapi/ccl/generated/Grammar.java   |  864 ++++++-------
 .../ccl/generated/GrammarConstants.java       |   99 +-
 .../ccl/generated/GrammarTokenManager.java    | 1142 +++++++++--------
 .../cinchapi/ccl/CompilerJavaCCLogicTest.java |  302 +++++
 .../java/com/cinchapi/ccl/GrammarTest.java    |  242 +++-
 8 files changed, 1597 insertions(+), 1184 deletions(-)

diff --git a/grammar/grammar.jjt b/grammar/grammar.jjt
index 0e1b86a8..f20b3880 100644
--- a/grammar/grammar.jjt
+++ b/grammar/grammar.jjt
@@ -152,7 +152,6 @@ TOKEN [IGNORE_CASE]:
 | < AS: "as" >
 | < FOR: "for" >
 | < WITH: "with" >
-| < AS_OF: "as of" >
 | < OPEN_BRACE : "{" >
 | < CLOSE_BRACE : "}" >
 | < COLON : ":" >
@@ -163,7 +162,7 @@ TOKEN : { < OPEN_PARENTHESES : "(" > }
 TOKEN : { < CLOSE_PARENTHESES : ")" > }
 TOKEN : { < OPEN_BRACKET : "[" > }
 TOKEN : { < CLOSE_BRACKET : "]" > }
-TOKEN [IGNORE_CASE]: { < TIMESTAMP: "at" | "on" | "during" | "in" > }
+TOKEN [IGNORE_CASE]: { < TIMESTAMP: "at" | "on" | "during" | "in" | "as of" > }
 TOKEN [IGNORE_CASE]: { < WHERE: "where" > }
 TOKEN [IGNORE_CASE]: { < RESERVED_IDENTIFIER: "$id$" > }
 
@@ -761,8 +760,8 @@ void DataModificationOperations() : {}
 
 void AddCommand() #Command :
 {
-    KeyTokenSymbol key;
-    ValueTokenSymbol value;
+    KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
     Token record;
 }
 {
@@ -774,8 +773,8 @@ void AddCommand() #Command :
 
 void SetCommand() #Command :
 {
-    KeyTokenSymbol key;
-    ValueTokenSymbol value;
+    KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
     Token record;
 }
 {
@@ -787,8 +786,8 @@ void SetCommand() #Command :
 
 void RemoveCommand() #Command :
 {
-    KeyTokenSymbol key;
-    ValueTokenSymbol value = null;
+    KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value = null;
     Token record;
 }
 {
@@ -800,9 +799,9 @@ void RemoveCommand() #Command :
 
 void ClearCommand() #Command :
 {
-    KeyTokenSymbol key = null;
+    KeyTokenSymbol<?> key = null;
     Token record;
-    Collection<KeyTokenSymbol> keys = null;
+    Collection<KeyTokenSymbol<?>> keys = null;
     Collection records = null;
 }
 {
@@ -835,9 +834,9 @@ void ClearCommand() #Command :
 
 void VerifyAndSwapCommand() #Command :
 {
-    KeyTokenSymbol key;
-    ValueTokenSymbol expected;
-    ValueTokenSymbol replacement;
+    KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> expected;
+    ValueTokenSymbol<?> replacement;
     Token record;
 }
 {
@@ -850,8 +849,8 @@ void VerifyAndSwapCommand() #Command :
 
 void VerifyOrSetCommand() #Command :
 {
-    KeyTokenSymbol key;
-    ValueTokenSymbol value;
+    KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
     Token record;
 }
 {
@@ -904,7 +903,7 @@ void LinkOperations() : {}
 
 void LinkCommand() #Command :
 {
-    KeyTokenSymbol key;
+    KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
@@ -928,7 +927,7 @@ void LinkCommand() #Command :
 
 void UnlinkCommand() #Command :
 {
-    KeyTokenSymbol key;
+    KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
@@ -969,12 +968,12 @@ void QueryOperations() : {}
 
 void SelectCommand() #Command :
 {
-    KeyTokenSymbol key;
+    KeyTokenSymbol<?> key;
     Token record;
     TimestampSymbol timestamp = null;
 }
 {
-    <SELECT> key=Key() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+    <SELECT> key=Key() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
     {
         jjtThis.command(new SelectSymbol(key, Long.parseLong(record.image), timestamp));
     }
@@ -982,8 +981,8 @@ void SelectCommand() #Command :
 
 void FetchCommand() #Command :
 {
-    KeyTokenSymbol key;
-    Collection<KeySymbol> keys = null;
+    KeyTokenSymbol<?> key;
+    Collection<KeyTokenSymbol<?>> keys = null;
     Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
@@ -992,24 +991,24 @@ void FetchCommand() #Command :
     <FETCH>
     (
         LOOKAHEAD(3)
-        key=Key() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        key=Key() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
         {
             jjtThis.command(new FetchSymbol(key, Long.parseLong(record.image), timestamp));
         }
       |
         LOOKAHEAD(3)
-        key=Key() <FROM> records=RecordCollection() (timestamp=AsOfTimestamp())?
+        key=Key() <FROM> records=RecordCollection() (timestamp=Timestamp())?
         {
             jjtThis.command(new FetchSymbol(key, records, timestamp));
         }
       |
         LOOKAHEAD(3)
-        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
         {
             jjtThis.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
         }
       |
-        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=AsOfTimestamp())?
+        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=Timestamp())?
         {
             jjtThis.command(new FetchSymbol(keys, records, timestamp));
         }
@@ -1018,8 +1017,8 @@ void FetchCommand() #Command :
 
 void GetCommand() #Command :
 {
-    KeyTokenSymbol key;
-    Collection<KeySymbol> keys = null;
+    KeyTokenSymbol<?> key;
+    Collection<KeyTokenSymbol<?>> keys = null;
     Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
@@ -1028,24 +1027,24 @@ void GetCommand() #Command :
     <GET>
     (
         LOOKAHEAD(3)
-        key=Key() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        key=Key() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
         {
             jjtThis.command(new GetSymbol(key, Long.parseLong(record.image), timestamp));
         }
       |
         LOOKAHEAD(3)
-        key=Key() <FROM> records=RecordCollection() (timestamp=AsOfTimestamp())?
+        key=Key() <FROM> records=RecordCollection() (timestamp=Timestamp())?
         {
             jjtThis.command(new GetSymbol(key, records, timestamp));
         }
       |
         LOOKAHEAD(3)
-        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
         {
             jjtThis.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
         }
       |
-        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=AsOfTimestamp())?
+        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=Timestamp())?
         {
             jjtThis.command(new GetSymbol(keys, records, timestamp));
         }
@@ -1062,12 +1061,12 @@ void DescribeCommand() #Command :
     <DESCRIBE>
     (
         LOOKAHEAD(2)
-        record=<NUMERIC> (timestamp=AsOfTimestamp())?
+        record=<NUMERIC> (timestamp=Timestamp())?
         {
             jjtThis.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
         }
       |
-        records=RecordCollection() (timestamp=AsOfTimestamp())?
+        records=RecordCollection() (timestamp=Timestamp())?
         {
             jjtThis.command(new DescribeSymbol(records, timestamp));
         }
@@ -1076,7 +1075,7 @@ void DescribeCommand() #Command :
 
 void AuditCommand() #Command :
 {
-    KeyTokenSymbol key = null;
+    KeyTokenSymbol<?> key = null;
     Token record;
 }
 {
@@ -1097,14 +1096,14 @@ void AuditCommand() #Command :
 
 void VerifyCommand() #Command :
 {
-    KeyTokenSymbol key;
-    ValueTokenSymbol value;
+    KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
     Token record;
     TimestampSymbol timestamp = null;
 }
 {
     <VERIFY> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
-    (timestamp=AsOfTimestamp())?
+    (timestamp=Timestamp())?
     {
         jjtThis.command(new VerifySymbol(key, value, Long.parseLong(record.image), timestamp));
     }
@@ -1112,7 +1111,7 @@ void VerifyCommand() #Command :
 
 void SearchCommand() #Command :
 {
-    KeyTokenSymbol key;
+    KeyTokenSymbol<?> key;
     Token query;
 }
 {
@@ -1156,9 +1155,9 @@ void AbortCommand() #Command : {}
 }
 
 void RevertCommand() #Command : {
-    KeyTokenSymbol key = null;
+    KeyTokenSymbol<?> key = null;
     Token record = null;
-    Collection<KeyTokenSymbol> keys = null;
+    Collection<KeyTokenSymbol<?>> keys = null;
     Collection<Long> records = null;
     TimestampSymbol timestamp;
 }
@@ -1167,27 +1166,27 @@ void RevertCommand() #Command : {
     (
         LOOKAHEAD(3)
         key=Key() <IN> record=<NUMERIC>
-        <TO> timestamp=Timestamp()
+        timestamp=Timestamp()
         {
             jjtThis.command(new RevertSymbol(key, Long.parseLong(record.image), timestamp));
         }
       |
         LOOKAHEAD(3)
         key=Key() <IN> records=RecordCollection()
-        <TO> timestamp=Timestamp()
+        timestamp=Timestamp()
         {
             jjtThis.command(new RevertSymbol(key, records, timestamp));
         }
       |
         LOOKAHEAD(3)
         keys=KeyCollection() <IN> record=<NUMERIC>
-        <TO> timestamp=Timestamp()
+        timestamp=Timestamp()
         {
             jjtThis.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
         }
       |
         keys=KeyCollection() <IN> records=RecordCollection()
-        <TO> timestamp=Timestamp()
+        timestamp=Timestamp()
         {
             jjtThis.command(new RevertSymbol(keys, records, timestamp));
         }
@@ -1229,13 +1228,3 @@ String JsonObject() :
     content=<QUOTED_STRING>
     { return content.image; }
 }
-
-TimestampSymbol AsOfTimestamp() :
-{
-    Token word;
-    String timestamp = "";
-}
-{
-    <AS_OF> (LOOKAHEAD(2) (word=<QUOTED_STRING> | word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC>) { timestamp += (timestamp.equals("")) ? word.image : " " + word.image; })+
-    { return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp)); }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/Compiler.java b/src/main/java/com/cinchapi/ccl/Compiler.java
index 16458011..c83073aa 100644
--- a/src/main/java/com/cinchapi/ccl/Compiler.java
+++ b/src/main/java/com/cinchapi/ccl/Compiler.java
@@ -31,6 +31,7 @@
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
+import com.cinchapi.ccl.grammar.command.ImplicitSymbol;
 import com.cinchapi.ccl.syntax.*;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.common.base.Verify;
@@ -268,7 +269,7 @@ public final List<Symbol> tokenize(AbstractSyntaxTree ast) {
             @Override
             public List<Symbol> visit(CommandTree tree, Object... data) {
                 List<Symbol> symbols = (List<Symbol>) data[0];
-                if(tree.root() != CommandSymbol.IMPLICIT) {
+                if(!(tree.root() instanceof ImplicitSymbol)) {
                     symbols.add(tree.root());
                 }
                 for (AbstractSyntaxTree child : tree.children()) {
diff --git a/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java b/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
index 5436c4f6..a9350725 100644
--- a/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
+++ b/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
@@ -20,16 +20,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.function.Function;
 
-import com.cinchapi.ccl.generated.ASTAnd;
-import com.cinchapi.ccl.generated.ASTExpression;
-import com.cinchapi.ccl.generated.ASTFunction;
-import com.cinchapi.ccl.generated.ASTOr;
-import com.cinchapi.ccl.generated.ASTOrder;
-import com.cinchapi.ccl.generated.ASTPage;
-import com.cinchapi.ccl.generated.ASTStart;
-import com.cinchapi.ccl.generated.Grammar;
-import com.cinchapi.ccl.generated.GrammarVisitor;
-import com.cinchapi.ccl.generated.SimpleNode;
+import com.cinchapi.ccl.generated.*;
 import com.cinchapi.ccl.syntax.*;
 import com.cinchapi.ccl.type.Operator;
 import com.google.common.collect.Multimap;
@@ -73,6 +64,7 @@ public Object visit(ASTStart node, Object data) {
                     PageTree pageTree = null;
                     OrderTree orderTree = null;
                     FunctionTree functionTree = null;
+                    CommandTree commandTree = null;
 
                     for (int i = 0; i < node.jjtGetNumChildren(); i++) {
                         Object child = node.jjtGetChild(i).jjtAccept(this,
@@ -86,26 +78,33 @@ else if(child instanceof OrderTree) {
                         else if(child instanceof FunctionTree) {
                             functionTree = (FunctionTree) child;
                         }
+                        else if(child instanceof CommandTree) {
+                            commandTree = (CommandTree) child;
+                        }
                         else {
                             conditionTree = (ConditionTree) child;
                         }
                     }
                     if(conditionTree != null && pageTree == null
-                            && orderTree == null && functionTree == null) {
+                            && orderTree == null && functionTree == null && commandTree == null) {
                         return conditionTree;
                     }
                     else if(pageTree != null && conditionTree == null
-                            && orderTree == null && functionTree == null) {
+                            && orderTree == null && functionTree == null && commandTree == null) {
                         return pageTree;
                     }
                     else if(orderTree != null && conditionTree == null
-                            && pageTree == null && functionTree == null) {
+                            && pageTree == null && functionTree == null && commandTree == null) {
                         return orderTree;
                     }
                     else if(functionTree != null && conditionTree == null
-                            && pageTree == null && orderTree == null) {
+                            && pageTree == null && orderTree == null && commandTree == null) {
                         return functionTree;
                     }
+                    else if(functionTree == null && conditionTree == null
+                            && pageTree == null && orderTree == null && commandTree != null) {
+                        return commandTree;
+                    }
                     else {
                         // If the statement has multiple elements, it is
                         // implicitly a command.
@@ -152,6 +151,11 @@ public Object visit(ASTPage node, Object data) {
                 public Object visit(ASTFunction node, Object data) {
                     return new FunctionTree(node.function());
                 }
+
+                @Override
+                public Object visit(ASTCommand node, Object data) {
+                    return new CommandTree(node.command(), null, null, null);
+                }
             };
 
             Grammar grammar = new Grammar(stream, valueParser, operatorParser,
diff --git a/src/main/java/com/cinchapi/ccl/generated/Grammar.java b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
index fed797bc..2cae2f03 100644
--- a/src/main/java/com/cinchapi/ccl/generated/Grammar.java
+++ b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
@@ -85,7 +85,7 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
     try {
       if (jj_2_1(4)) {
         Command();
-        jj_consume_token(79);
+        jj_consume_token(78);
       } else if (jj_2_2(3)) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case WHERE:{
@@ -116,18 +116,18 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
           jj_la1[2] = jj_gen;
           ;
         }
-        jj_consume_token(79);
+        jj_consume_token(78);
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case PAGE:
         case SIZE:{
           Page();
-          jj_consume_token(79);
+          jj_consume_token(78);
           break;
           }
         case ORDER:{
           Order();
-          jj_consume_token(79);
+          jj_consume_token(78);
           break;
           }
         case NUMERIC:
@@ -136,7 +136,7 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
         case ALPHANUMERIC:
         case PERIOD_SEPARATED_STRING:{
           Function();
-          jj_consume_token(79);
+          jj_consume_token(78);
           break;
           }
         default:
@@ -692,12 +692,12 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 80:{
-          word = jj_consume_token(80);
+        case 79:{
+          word = jj_consume_token(79);
           break;
           }
-        case 81:{
-          word = jj_consume_token(81);
+        case 80:{
+          word = jj_consume_token(80);
           break;
           }
         default:
@@ -730,8 +730,8 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
     case ALPHANUMERIC:
     case PERIOD_SEPARATED_STRING:
     case NON_ALPHANUMERIC_AND_ALPHANUMERIC:
-    case 80:
-    case 81:{
+    case 79:
+    case 80:{
       label_5:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -759,12 +759,12 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 80:{
-          word = jj_consume_token(80);
+        case 79:{
+          word = jj_consume_token(79);
           break;
           }
-        case 81:{
-          word = jj_consume_token(81);
+        case 80:{
+          word = jj_consume_token(80);
           break;
           }
         default:
@@ -1626,8 +1626,8 @@ final public void DataModificationOperations() throws ParseException {
   final public void AddCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
-    ValueTokenSymbol value;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
     Token record;
     try {
       jj_consume_token(ADD);
@@ -1663,8 +1663,8 @@ record = jj_consume_token(NUMERIC);
   final public void SetCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeySymbol key;
-    ValueSymbol value;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
     Token record;
     try {
       jj_consume_token(SET);
@@ -1700,8 +1700,8 @@ record = jj_consume_token(NUMERIC);
   final public void RemoveCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
-    ValueTokenSymbol value = null;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value = null;
     Token record;
     try {
       jj_consume_token(REMOVE);
@@ -1758,9 +1758,9 @@ record = jj_consume_token(NUMERIC);
   final public void ClearCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
     Token record;
-    Collection<KeyTokenymbol> keys = null;
+    Collection<KeyTokenSymbol<?>> keys = null;
     Collection records = null;
     try {
       jj_consume_token(CLEAR);
@@ -1826,9 +1826,9 @@ record = jj_consume_token(NUMERIC);
   final public void VerifyAndSwapCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
-    ValueTokenSymbol expected;
-    ValueTokenSymbol replacement;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> expected;
+    ValueTokenSymbol<?> replacement;
     Token record;
     try {
       jj_consume_token(VERIFY_AND_SWAP);
@@ -1866,8 +1866,8 @@ record = jj_consume_token(NUMERIC);
   final public void VerifyOrSetCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
-    ValueTokenSymbol value;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
     Token record;
     try {
       jj_consume_token(VERIFY_OR_SET);
@@ -1998,7 +1998,7 @@ final public void LinkOperations() throws ParseException {
   final public void LinkCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
@@ -2054,7 +2054,7 @@ final public void LinkCommand() throws ParseException {/*@bgen(jjtree) Command *
   final public void UnlinkCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
@@ -2147,7 +2147,7 @@ final public void QueryOperations() throws ParseException {
   final public void SelectCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token record;
     TimestampSymbol timestamp = null;
     try {
@@ -2156,8 +2156,8 @@ final public void SelectCommand() throws ParseException {/*@bgen(jjtree) Command
       jj_consume_token(FROM);
       record = jj_consume_token(NUMERIC);
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case AS_OF:{
-        timestamp = AsOfTimestamp();
+      case TIMESTAMP:{
+        timestamp = Timestamp();
         break;
         }
       default:
@@ -2191,8 +2191,8 @@ record = jj_consume_token(NUMERIC);
   final public void FetchCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
-    Collection<KeySymbol> keys = null;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+    Collection<KeyTokenSymbol<?>> keys = null;
     Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
@@ -2203,8 +2203,8 @@ final public void FetchCommand() throws ParseException {/*@bgen(jjtree) Command
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case AS_OF:{
-          timestamp = AsOfTimestamp();
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
         default:
@@ -2219,8 +2219,8 @@ record = jj_consume_token(NUMERIC);
         jj_consume_token(FROM);
         records = RecordCollection();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case AS_OF:{
-          timestamp = AsOfTimestamp();
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
         default:
@@ -2235,8 +2235,8 @@ record = jj_consume_token(NUMERIC);
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case AS_OF:{
-          timestamp = AsOfTimestamp();
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
         default:
@@ -2253,8 +2253,8 @@ record = jj_consume_token(NUMERIC);
           jj_consume_token(FROM);
           records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case AS_OF:{
-            timestamp = AsOfTimestamp();
+          case TIMESTAMP:{
+            timestamp = Timestamp();
             break;
             }
           default:
@@ -2296,8 +2296,8 @@ record = jj_consume_token(NUMERIC);
   final public void GetCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
-    Collection<KeySymbol> keys = null;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+    Collection<KeyTokenSymbol<?>> keys = null;
     Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
@@ -2308,8 +2308,8 @@ final public void GetCommand() throws ParseException {/*@bgen(jjtree) Command */
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case AS_OF:{
-          timestamp = AsOfTimestamp();
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
         default:
@@ -2324,8 +2324,8 @@ record = jj_consume_token(NUMERIC);
         jj_consume_token(FROM);
         records = RecordCollection();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case AS_OF:{
-          timestamp = AsOfTimestamp();
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
         default:
@@ -2340,8 +2340,8 @@ record = jj_consume_token(NUMERIC);
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case AS_OF:{
-          timestamp = AsOfTimestamp();
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
         default:
@@ -2358,8 +2358,8 @@ record = jj_consume_token(NUMERIC);
           jj_consume_token(FROM);
           records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case AS_OF:{
-            timestamp = AsOfTimestamp();
+          case TIMESTAMP:{
+            timestamp = Timestamp();
             break;
             }
           default:
@@ -2409,8 +2409,8 @@ final public void DescribeCommand() throws ParseException {/*@bgen(jjtree) Comma
       if (jj_2_24(2)) {
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case AS_OF:{
-          timestamp = AsOfTimestamp();
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
         default:
@@ -2425,8 +2425,8 @@ record = jj_consume_token(NUMERIC);
         case OPEN_BRACKET:{
           records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case AS_OF:{
-            timestamp = AsOfTimestamp();
+          case TIMESTAMP:{
+            timestamp = Timestamp();
             break;
             }
           default:
@@ -2468,7 +2468,7 @@ record = jj_consume_token(NUMERIC);
   final public void AuditCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
     Token record;
     try {
       jj_consume_token(AUDIT);
@@ -2518,8 +2518,8 @@ record = jj_consume_token(NUMERIC);
   final public void VerifyCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
-    ValueTokenSymbol value;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
     Token record;
     TimestampSymbol timestamp = null;
     try {
@@ -2530,8 +2530,8 @@ final public void VerifyCommand() throws ParseException {/*@bgen(jjtree) Command
       jj_consume_token(IN);
       record = jj_consume_token(NUMERIC);
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case AS_OF:{
-        timestamp = AsOfTimestamp();
+      case TIMESTAMP:{
+        timestamp = Timestamp();
         break;
         }
       default:
@@ -2565,7 +2565,7 @@ record = jj_consume_token(NUMERIC);
   final public void SearchCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token query;
     try {
       jj_consume_token(SEARCH);
@@ -2668,9 +2668,9 @@ final public void AbortCommand() throws ParseException {/*@bgen(jjtree) Command
   final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
     Token record = null;
-    Collection<KeyTokenSymbol> keys = null;
+    Collection<KeyTokenSymbol<?>> keys = null;
     Collection<Long> records = null;
     TimestampSymbol timestamp;
     try {
@@ -2679,7 +2679,6 @@ final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command
         key = Key();
         jj_consume_token(IN);
         record = jj_consume_token(NUMERIC);
-        jj_consume_token(TO);
         timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
@@ -2688,7 +2687,6 @@ record = jj_consume_token(NUMERIC);
         key = Key();
         jj_consume_token(IN);
         records = RecordCollection();
-        jj_consume_token(TO);
         timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
@@ -2697,7 +2695,6 @@ record = jj_consume_token(NUMERIC);
         keys = KeyCollection();
         jj_consume_token(IN);
         record = jj_consume_token(NUMERIC);
-        jj_consume_token(TO);
         timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
@@ -2708,7 +2705,6 @@ record = jj_consume_token(NUMERIC);
           keys = KeyCollection();
           jj_consume_token(IN);
           records = RecordCollection();
-          jj_consume_token(TO);
           timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
@@ -2799,52 +2795,6 @@ record = jj_consume_token(NUMERIC);
     throw new Error("Missing return statement in function");
 }
 
-  final public TimestampSymbol AsOfTimestamp() throws ParseException {Token word;
-    String timestamp = "";
-    jj_consume_token(AS_OF);
-    label_12:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case QUOTED_STRING:{
-        word = jj_consume_token(QUOTED_STRING);
-        break;
-        }
-      case SIGNED_INTEGER:{
-        word = jj_consume_token(SIGNED_INTEGER);
-        break;
-        }
-      case SIGNED_DECIMAL:{
-        word = jj_consume_token(SIGNED_DECIMAL);
-        break;
-        }
-      case NUMERIC:{
-        word = jj_consume_token(NUMERIC);
-        break;
-        }
-      case ALPHANUMERIC:{
-        word = jj_consume_token(ALPHANUMERIC);
-        break;
-        }
-      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-        word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
-        break;
-        }
-      default:
-        jj_la1[84] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-timestamp += (timestamp.equals("")) ? word.image : " " + word.image;
-      if (jj_2_29(2)) {
-        ;
-      } else {
-        break label_12;
-      }
-    }
-{if ("" != null) return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp));}
-    throw new Error("Missing return statement in function");
-}
-
   private boolean jj_2_1(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
@@ -3069,29 +3019,33 @@ private boolean jj_2_28(int xla)
     finally { jj_save(27, xla); }
   }
 
-  private boolean jj_2_29(int xla)
+  private boolean jj_3R_47()
  {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_29()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(28, xla); }
+    if (jj_3R_69()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_46()
+ {
+    if (jj_3R_68()) return true;
+    return false;
   }
 
   private boolean jj_3_6()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(69)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(67)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
+    if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(74)) {
+    if (jj_scan_token(73)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
+    if (jj_scan_token(72)) return true;
     }
     }
     }
@@ -3100,13 +3054,7 @@ private boolean jj_3_6()
     return false;
   }
 
-  private boolean jj_3R_48()
- {
-    if (jj_3R_70()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_100()
+  private boolean jj_3R_98()
  {
     Token xsp;
     if (jj_3_6()) return true;
@@ -3117,39 +3065,39 @@ private boolean jj_3R_100()
     return false;
   }
 
-  private boolean jj_3R_47()
+  private boolean jj_3R_45()
  {
-    if (jj_3R_69()) return true;
+    if (jj_3R_67()) return true;
     return false;
   }
 
-  private boolean jj_3R_83()
+  private boolean jj_3R_81()
  {
     if (jj_scan_token(STAGE)) return true;
     return false;
   }
 
-  private boolean jj_3R_46()
+  private boolean jj_3R_44()
  {
-    if (jj_3R_68()) return true;
+    if (jj_3R_66()) return true;
     return false;
   }
 
-  private boolean jj_3R_45()
+  private boolean jj_3R_43()
  {
-    if (jj_3R_67()) return true;
+    if (jj_3R_65()) return true;
     return false;
   }
 
-  private boolean jj_3R_87()
+  private boolean jj_3R_85()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_7()) {
     jj_scanpos = xsp;
-    if (jj_3R_100()) {
+    if (jj_3R_98()) {
     jj_scanpos = xsp;
-    if (jj_3R_101()) return true;
+    if (jj_3R_99()) return true;
     }
     }
     return false;
@@ -3157,31 +3105,31 @@ private boolean jj_3R_87()
 
   private boolean jj_3_7()
  {
-    if (jj_3R_16()) return true;
+    if (jj_3R_15()) return true;
     return false;
   }
 
-  private boolean jj_3R_62()
+  private boolean jj_3R_60()
  {
-    if (jj_3R_85()) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
-  private boolean jj_3R_37()
+  private boolean jj_3R_35()
  {
     Token xsp;
     xsp = jj_scanpos;
+    if (jj_3R_42()) {
+    jj_scanpos = xsp;
+    if (jj_3R_43()) {
+    jj_scanpos = xsp;
     if (jj_3R_44()) {
     jj_scanpos = xsp;
     if (jj_3R_45()) {
     jj_scanpos = xsp;
     if (jj_3R_46()) {
     jj_scanpos = xsp;
-    if (jj_3R_47()) {
-    jj_scanpos = xsp;
-    if (jj_3R_48()) {
-    jj_scanpos = xsp;
-    if (jj_3R_49()) return true;
+    if (jj_3R_47()) return true;
     }
     }
     }
@@ -3190,68 +3138,68 @@ private boolean jj_3R_37()
     return false;
   }
 
-  private boolean jj_3R_44()
+  private boolean jj_3R_42()
  {
-    if (jj_3R_66()) return true;
+    if (jj_3R_64()) return true;
     return false;
   }
 
-  private boolean jj_3R_61()
+  private boolean jj_3R_59()
  {
-    if (jj_3R_84()) return true;
+    if (jj_3R_82()) return true;
     return false;
   }
 
-  private boolean jj_3R_75()
+  private boolean jj_3R_73()
  {
     if (jj_scan_token(UNLINK)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_30()
+  private boolean jj_3R_29()
  {
-    if (jj_3R_42()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  private boolean jj_3R_60()
+  private boolean jj_3R_58()
  {
-    if (jj_3R_83()) return true;
+    if (jj_3R_81()) return true;
     return false;
   }
 
-  private boolean jj_3R_41()
+  private boolean jj_3R_39()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_60()) {
+    if (jj_3R_58()) {
     jj_scanpos = xsp;
-    if (jj_3R_61()) {
+    if (jj_3R_59()) {
     jj_scanpos = xsp;
-    if (jj_3R_62()) return true;
+    if (jj_3R_60()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_29()
+  private boolean jj_3R_28()
  {
-    if (jj_3R_41()) return true;
+    if (jj_3R_39()) return true;
     return false;
   }
 
-  private boolean jj_3R_28()
+  private boolean jj_3R_27()
  {
-    if (jj_3R_40()) return true;
+    if (jj_3R_38()) return true;
     return false;
   }
 
-  private boolean jj_3R_27()
+  private boolean jj_3R_26()
  {
-    if (jj_3R_39()) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
@@ -3259,17 +3207,17 @@ private boolean jj_3_11()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(65)) {
+    if (jj_scan_token(64)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(69)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(67)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
+    if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(74)) return true;
+    if (jj_scan_token(73)) return true;
     }
     }
     }
@@ -3278,31 +3226,33 @@ private boolean jj_3_11()
     return false;
   }
 
-  private boolean jj_3R_26()
+  private boolean jj_3R_25()
  {
-    if (jj_3R_38()) return true;
+    if (jj_3R_36()) return true;
     return false;
   }
 
-  private boolean jj_3R_82()
+  private boolean jj_3R_80()
  {
     if (jj_scan_token(SEARCH)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FOR)) return true;
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_34()
+  private boolean jj_3R_33()
  {
     if (jj_scan_token(PERIOD_SEPARATED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_13()
+  private boolean jj_3R_12()
  {
     Token xsp;
     xsp = jj_scanpos;
+    if (jj_3R_24()) {
+    jj_scanpos = xsp;
     if (jj_3R_25()) {
     jj_scanpos = xsp;
     if (jj_3R_26()) {
@@ -3311,9 +3261,7 @@ private boolean jj_3R_13()
     jj_scanpos = xsp;
     if (jj_3R_28()) {
     jj_scanpos = xsp;
-    if (jj_3R_29()) {
-    jj_scanpos = xsp;
-    if (jj_3R_30()) return true;
+    if (jj_3R_29()) return true;
     }
     }
     }
@@ -3322,25 +3270,25 @@ private boolean jj_3R_13()
     return false;
   }
 
-  private boolean jj_3R_25()
+  private boolean jj_3R_24()
  {
-    if (jj_3R_37()) return true;
+    if (jj_3R_35()) return true;
     return false;
   }
 
-  private boolean jj_3R_33()
+  private boolean jj_3R_32()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(40)) {
+    if (jj_scan_token(39)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(69)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(67)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) return true;
+    if (jj_scan_token(71)) return true;
     }
     }
     }
@@ -3350,213 +3298,219 @@ private boolean jj_3R_33()
 
   private boolean jj_3_5()
  {
-    if (jj_3R_15()) return true;
+    if (jj_3R_14()) return true;
     return false;
   }
 
-  private boolean jj_3R_21()
+  private boolean jj_3R_20()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_5()) {
     jj_scanpos = xsp;
-    if (jj_3R_33()) {
+    if (jj_3R_32()) {
     jj_scanpos = xsp;
-    if (jj_3R_34()) return true;
+    if (jj_3R_33()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_32()
+  private boolean jj_3R_31()
  {
     if (jj_scan_token(TIMESTAMP)) return true;
+    Token xsp;
+    if (jj_3_11()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_11()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_81()
+  private boolean jj_3R_79()
  {
     if (jj_scan_token(VERIFY)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(AS)) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
-  private boolean jj_3R_74()
+  private boolean jj_3R_72()
  {
     if (jj_scan_token(LINK)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_107()
+  private boolean jj_3R_105()
  {
     if (jj_scan_token(BINARY_OPERATOR)) return true;
     return false;
   }
 
-  private boolean jj_3R_99()
+  private boolean jj_3R_97()
  {
-    if (jj_3R_107()) return true;
-    if (jj_3R_108()) return true;
+    if (jj_3R_105()) return true;
+    if (jj_3R_106()) return true;
     return false;
   }
 
-  private boolean jj_3R_98()
+  private boolean jj_3R_96()
  {
-    if (jj_3R_106()) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_104()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
-  private boolean jj_3R_97()
+  private boolean jj_3R_95()
  {
-    if (jj_3R_104()) return true;
-    if (jj_3R_105()) return true;
+    if (jj_3R_102()) return true;
+    if (jj_3R_103()) return true;
     return false;
   }
 
-  private boolean jj_3R_95()
+  private boolean jj_3R_93()
  {
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_20()
+  private boolean jj_3R_19()
  {
     if (jj_scan_token(OPEN_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_96()
+  private boolean jj_3R_94()
  {
-    if (jj_3R_102()) return true;
-    if (jj_3R_103()) return true;
+    if (jj_3R_100()) return true;
+    if (jj_3R_101()) return true;
     return false;
   }
 
-  private boolean jj_3R_52()
+  private boolean jj_3R_50()
  {
-    if (jj_3R_75()) return true;
+    if (jj_3R_73()) return true;
     return false;
   }
 
-  private boolean jj_3R_106()
+  private boolean jj_3R_104()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(43)) {
+    if (jj_scan_token(42)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(45)) {
+    if (jj_scan_token(44)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(46)) return true;
+    if (jj_scan_token(45)) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_39()
+  private boolean jj_3R_37()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_51()) {
+    if (jj_3R_49()) {
     jj_scanpos = xsp;
-    if (jj_3R_52()) return true;
+    if (jj_3R_50()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_51()
+  private boolean jj_3R_49()
  {
-    if (jj_3R_74()) return true;
+    if (jj_3R_72()) return true;
     return false;
   }
 
-  private boolean jj_3R_19()
+  private boolean jj_3R_18()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(69)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) return true;
+    if (jj_scan_token(67)) return true;
     }
     return false;
   }
 
   private boolean jj_3_25()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_86()
+  private boolean jj_3R_84()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_96()) {
+    if (jj_3R_94()) {
     jj_scanpos = xsp;
-    if (jj_3R_97()) {
+    if (jj_3R_95()) {
     jj_scanpos = xsp;
-    if (jj_3R_98()) {
+    if (jj_3R_96()) {
     jj_scanpos = xsp;
-    if (jj_3R_99()) return true;
+    if (jj_3R_97()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_24()
+  private boolean jj_3R_23()
  {
-    if (jj_3R_36()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_91()
+  private boolean jj_3R_89()
  {
-    if (jj_3R_22()) return true;
+    if (jj_3R_21()) return true;
     return false;
   }
 
-  private boolean jj_3R_104()
+  private boolean jj_3R_102()
  {
     Token xsp;
     xsp = jj_scanpos;
+    if (jj_scan_token(53)) {
+    jj_scanpos = xsp;
     if (jj_scan_token(54)) {
     jj_scanpos = xsp;
     if (jj_scan_token(55)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(56)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(57)) return true;
+    if (jj_scan_token(56)) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_80()
+  private boolean jj_3R_78()
  {
     if (jj_scan_token(AUDIT)) return true;
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_25()) {
     jj_scanpos = xsp;
-    if (jj_3R_95()) return true;
+    if (jj_3R_93()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_18()
+  private boolean jj_3R_17()
  {
     if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_32()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
@@ -3564,68 +3518,68 @@ private boolean jj_3_14()
  {
     Token xsp;
     xsp = jj_scanpos;
+    if (jj_scan_token(69)) {
+    jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
+    if (jj_scan_token(72)) return true;
     }
     }
     }
     if (jj_scan_token(COMMA)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_19()) {
+    if (jj_3R_18()) {
     jj_scanpos = xsp;
-    if (jj_3R_20()) return true;
+    if (jj_3R_19()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_17()
+  private boolean jj_3R_16()
  {
     if (jj_scan_token(CLOSE_PARENTHESES)) return true;
     return false;
   }
 
-  private boolean jj_3R_90()
+  private boolean jj_3R_88()
  {
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_102()
+  private boolean jj_3R_100()
  {
     if (jj_scan_token(LINKS_TO)) return true;
     return false;
   }
 
-  private boolean jj_3R_94()
+  private boolean jj_3R_92()
  {
-    if (jj_3R_22()) return true;
+    if (jj_3R_21()) return true;
     return false;
   }
 
-  private boolean jj_3R_64()
+  private boolean jj_3R_62()
  {
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    if (jj_3R_14()) return true;
+    if (jj_3R_13()) return true;
     return false;
   }
 
-  private boolean jj_3R_43()
+  private boolean jj_3R_41()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_64()) {
+    if (jj_3R_62()) {
     jj_scanpos = xsp;
-    if (jj_3R_65()) return true;
+    if (jj_3R_63()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_73()
+  private boolean jj_3R_71()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -3634,9 +3588,9 @@ private boolean jj_3R_73()
     if (jj_scan_token(24)) return true;
     }
     xsp = jj_scanpos;
-    if (jj_3R_90()) {
+    if (jj_3R_88()) {
     jj_scanpos = xsp;
-    if (jj_3R_91()) return true;
+    if (jj_3R_89()) return true;
     }
     return false;
   }
@@ -3645,20 +3599,20 @@ private boolean jj_3_13()
  {
     Token xsp;
     xsp = jj_scanpos;
+    if (jj_scan_token(69)) {
+    jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
+    if (jj_scan_token(72)) return true;
     }
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_17()) {
+    if (jj_3R_16()) {
     jj_scanpos = xsp;
-    if (jj_3R_18()) return true;
+    if (jj_3R_17()) return true;
     }
     return false;
   }
@@ -3668,99 +3622,76 @@ private boolean jj_3_24()
     if (jj_scan_token(NUMERIC)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_24()) jj_scanpos = xsp;
+    if (jj_3R_23()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_16()
+  private boolean jj_3R_15()
  {
     if (jj_scan_token(ALPHANUMERIC)) return true;
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
     return false;
   }
 
-  private boolean jj_3R_50()
+  private boolean jj_3R_48()
  {
     if (jj_scan_token(INSERT)) return true;
-    if (jj_3R_72()) return true;
+    if (jj_3R_70()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_73()) jj_scanpos = xsp;
+    if (jj_3R_71()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_114()
+  private boolean jj_3R_112()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_31()
+  private boolean jj_3R_30()
  {
-    if (jj_3R_43()) return true;
+    if (jj_3R_41()) return true;
     return false;
   }
 
-  private boolean jj_3R_79()
+  private boolean jj_3R_77()
  {
     if (jj_scan_token(DESCRIBE)) return true;
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_24()) {
     jj_scanpos = xsp;
-    if (jj_3R_94()) return true;
+    if (jj_3R_92()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_14()
+  private boolean jj_3R_13()
  {
-    if (jj_3R_31()) return true;
+    if (jj_3R_30()) return true;
     return false;
   }
 
-  private boolean jj_3R_38()
+  private boolean jj_3R_36()
  {
-    if (jj_3R_50()) return true;
+    if (jj_3R_48()) return true;
     return false;
   }
 
-  private boolean jj_3_29()
+  private boolean jj_3R_14()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(65)) {
+    if (jj_scan_token(69)) {
     jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(74)) return true;
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_15()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(67)) {
     jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
+    if (jj_scan_token(72)) return true;
     }
     }
     }
@@ -3770,36 +3701,24 @@ private boolean jj_3R_15()
     return false;
   }
 
-  private boolean jj_3R_93()
+  private boolean jj_3R_91()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
-  private boolean jj_3R_71()
+  private boolean jj_3R_69()
  {
     if (jj_scan_token(VERIFY_OR_SET)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(AS)) return true;
-    if (jj_3R_87()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_36()
- {
-    if (jj_scan_token(AS_OF)) return true;
-    Token xsp;
-    if (jj_3_29()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_29()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_85()) return true;
     return false;
   }
 
   private boolean jj_3_23()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
@@ -3807,40 +3726,40 @@ private boolean jj_3_4()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(39)) jj_scanpos = xsp;
-    if (jj_3R_14()) return true;
+    if (jj_scan_token(38)) jj_scanpos = xsp;
+    if (jj_3R_13()) return true;
     return false;
   }
 
   private boolean jj_3_12()
  {
-    if (jj_3R_15()) return true;
+    if (jj_3R_14()) return true;
     return false;
   }
 
   private boolean jj_3_22()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_22()) return true;
+    if (jj_3R_21()) return true;
     return false;
   }
 
-  private boolean jj_3R_113()
+  private boolean jj_3R_111()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(69)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(67)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
+    if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(74)) {
+    if (jj_scan_token(73)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
+    if (jj_scan_token(72)) return true;
     }
     }
     }
@@ -3851,35 +3770,35 @@ private boolean jj_3R_113()
 
   private boolean jj_3_3()
  {
-    if (jj_3R_13()) return true;
+    if (jj_3R_12()) return true;
     if (jj_scan_token(0)) return true;
     return false;
   }
 
-  private boolean jj_3R_72()
+  private boolean jj_3R_70()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_70()
+  private boolean jj_3R_68()
  {
     if (jj_scan_token(VERIFY_AND_SWAP)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(AS)) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
-  private boolean jj_3R_108()
+  private boolean jj_3R_106()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_10()) {
     jj_scanpos = xsp;
-    if (jj_3R_113()) {
+    if (jj_3R_111()) {
     jj_scanpos = xsp;
-    if (jj_3R_114()) return true;
+    if (jj_3R_112()) return true;
     }
     }
     return false;
@@ -3887,25 +3806,25 @@ private boolean jj_3R_108()
 
   private boolean jj_3_10()
  {
-    if (jj_3R_16()) return true;
+    if (jj_3R_15()) return true;
     return false;
   }
 
   private boolean jj_3_21()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_35()
+  private boolean jj_3R_34()
  {
     if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3R_78()
+  private boolean jj_3R_76()
  {
     if (jj_scan_token(GET)) return true;
     Token xsp;
@@ -3916,21 +3835,21 @@ private boolean jj_3R_78()
     jj_scanpos = xsp;
     if (jj_3_23()) {
     jj_scanpos = xsp;
-    if (jj_3R_93()) return true;
+    if (jj_3R_91()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_23()
+  private boolean jj_3R_22()
  {
     if (jj_scan_token(OPEN_BRACKET)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_35()) { jj_scanpos = xsp; break; }
+      if (jj_3R_34()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(CLOSE_BRACKET)) return true;
     return false;
@@ -3940,18 +3859,18 @@ private boolean jj_3_2()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(39)) jj_scanpos = xsp;
-    if (jj_3R_14()) return true;
+    if (jj_scan_token(38)) jj_scanpos = xsp;
+    if (jj_3R_13()) return true;
     return false;
   }
 
-  private boolean jj_3R_89()
+  private boolean jj_3R_87()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
-  private boolean jj_3R_112()
+  private boolean jj_3R_110()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
@@ -3959,12 +3878,12 @@ private boolean jj_3R_112()
 
   private boolean jj_3_1()
  {
-    if (jj_3R_13()) return true;
-    if (jj_scan_token(79)) return true;
+    if (jj_3R_12()) return true;
+    if (jj_scan_token(78)) return true;
     return false;
   }
 
-  private boolean jj_3R_109()
+  private boolean jj_3R_107()
  {
     if (jj_scan_token(COMMA)) return true;
     return false;
@@ -3972,13 +3891,13 @@ private boolean jj_3R_109()
 
   private boolean jj_3_17()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
-  private boolean jj_3R_92()
+  private boolean jj_3R_90()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
@@ -3986,21 +3905,21 @@ private boolean jj_3_8()
  {
     Token xsp;
     xsp = jj_scanpos;
+    if (jj_scan_token(69)) {
+    jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
+    if (jj_scan_token(67)) {
+    jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(73)) {
     jj_scanpos = xsp;
     if (jj_scan_token(72)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(74)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(81)) return true;
+    if (jj_scan_token(80)) return true;
     }
     }
     }
@@ -4011,14 +3930,14 @@ private boolean jj_3_8()
     return false;
   }
 
-  private boolean jj_3R_22()
+  private boolean jj_3R_21()
  {
     if (jj_scan_token(OPEN_BRACKET)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_109()) { jj_scanpos = xsp; break; }
+      if (jj_3R_107()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(CLOSE_BRACKET)) return true;
     return false;
@@ -4026,15 +3945,15 @@ private boolean jj_3R_22()
 
   private boolean jj_3_16()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_22()) return true;
+    if (jj_3R_21()) return true;
     return false;
   }
 
   private boolean jj_3_20()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
@@ -4042,21 +3961,21 @@ private boolean jj_3_9()
  {
     Token xsp;
     xsp = jj_scanpos;
+    if (jj_scan_token(69)) {
+    jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
+    if (jj_scan_token(67)) {
+    jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(73)) {
     jj_scanpos = xsp;
     if (jj_scan_token(72)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(74)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) return true;
+    if (jj_scan_token(80)) return true;
     }
     }
     }
@@ -4067,7 +3986,7 @@ private boolean jj_3_9()
     return false;
   }
 
-  private boolean jj_3R_111()
+  private boolean jj_3R_109()
  {
     Token xsp;
     if (jj_3_9()) return true;
@@ -4078,16 +3997,16 @@ private boolean jj_3R_111()
     return false;
   }
 
-  private boolean jj_3R_88()
+  private boolean jj_3R_86()
  {
     if (jj_scan_token(AS)) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
   private boolean jj_3_15()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
@@ -4095,19 +4014,19 @@ private boolean jj_3_15()
 
   private boolean jj_3_19()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_22()) return true;
+    if (jj_3R_21()) return true;
     return false;
   }
 
-  private boolean jj_3R_63()
+  private boolean jj_3R_61()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
-  private boolean jj_3R_69()
+  private boolean jj_3R_67()
  {
     if (jj_scan_token(CLEAR)) return true;
     Token xsp;
@@ -4118,7 +4037,7 @@ private boolean jj_3R_69()
     jj_scanpos = xsp;
     if (jj_3_17()) {
     jj_scanpos = xsp;
-    if (jj_3R_89()) return true;
+    if (jj_3R_87()) return true;
     }
     }
     }
@@ -4127,7 +4046,7 @@ private boolean jj_3R_69()
 
   private boolean jj_3_18()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
@@ -4135,31 +4054,31 @@ private boolean jj_3_18()
 
   private boolean jj_3_28()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_22()) return true;
     return false;
   }
 
-  private boolean jj_3R_110()
+  private boolean jj_3R_108()
  {
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
     return false;
   }
 
-  private boolean jj_3R_105()
+  private boolean jj_3R_103()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_110()) {
+    if (jj_3R_108()) {
     jj_scanpos = xsp;
-    if (jj_3R_111()) {
+    if (jj_3R_109()) {
     jj_scanpos = xsp;
-    if (jj_3R_112()) return true;
+    if (jj_3R_110()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_77()
+  private boolean jj_3R_75()
  {
     if (jj_scan_token(FETCH)) return true;
     Token xsp;
@@ -4170,7 +4089,7 @@ private boolean jj_3R_77()
     jj_scanpos = xsp;
     if (jj_3_20()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) return true;
+    if (jj_3R_90()) return true;
     }
     }
     }
@@ -4179,19 +4098,19 @@ private boolean jj_3R_77()
 
   private boolean jj_3_27()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(IN)) return true;
-    if (jj_3R_22()) return true;
+    if (jj_3R_21()) return true;
     return false;
   }
 
-  private boolean jj_3R_68()
+  private boolean jj_3R_66()
  {
     if (jj_scan_token(REMOVE)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_88()) jj_scanpos = xsp;
+    if (jj_3R_86()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(25)) {
     jj_scanpos = xsp;
@@ -4201,7 +4120,7 @@ private boolean jj_3R_68()
     return false;
   }
 
-  private boolean jj_3R_103()
+  private boolean jj_3R_101()
  {
     if (jj_scan_token(NUMERIC)) return true;
     return false;
@@ -4209,22 +4128,22 @@ private boolean jj_3R_103()
 
   private boolean jj_3_26()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(IN)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_76()
+  private boolean jj_3R_74()
  {
     if (jj_scan_token(SELECT)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_42()
+  private boolean jj_3R_40()
  {
     if (jj_scan_token(REVERT)) return true;
     Token xsp;
@@ -4235,83 +4154,87 @@ private boolean jj_3R_42()
     jj_scanpos = xsp;
     if (jj_3_28()) {
     jj_scanpos = xsp;
-    if (jj_3R_63()) return true;
+    if (jj_3R_61()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_67()
+  private boolean jj_3R_65()
  {
     if (jj_scan_token(SET)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(AS)) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
-  private boolean jj_3R_101()
+  private boolean jj_3R_99()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_59()
+  private boolean jj_3R_57()
  {
-    if (jj_3R_82()) return true;
+    if (jj_3R_80()) return true;
     return false;
   }
 
-  private boolean jj_3R_58()
+  private boolean jj_3R_56()
  {
-    if (jj_3R_81()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
-  private boolean jj_3R_57()
+  private boolean jj_3R_55()
  {
-    if (jj_3R_80()) return true;
+    if (jj_3R_78()) return true;
     return false;
   }
 
-  private boolean jj_3R_85()
+  private boolean jj_3R_83()
  {
     if (jj_scan_token(ABORT)) return true;
     return false;
   }
 
-  private boolean jj_3R_56()
+  private boolean jj_3R_54()
  {
-    if (jj_3R_79()) return true;
+    if (jj_3R_77()) return true;
     return false;
   }
 
-  private boolean jj_3R_66()
+  private boolean jj_3R_64()
  {
     if (jj_scan_token(ADD)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_20()) return true;
     if (jj_scan_token(AS)) return true;
-    if (jj_3R_87()) return true;
+    if (jj_3R_85()) return true;
     return false;
   }
 
-  private boolean jj_3R_55()
+  private boolean jj_3R_53()
  {
-    if (jj_3R_78()) return true;
+    if (jj_3R_76()) return true;
     return false;
   }
 
-  private boolean jj_3R_54()
+  private boolean jj_3R_52()
  {
-    if (jj_3R_77()) return true;
+    if (jj_3R_75()) return true;
     return false;
   }
 
-  private boolean jj_3R_40()
+  private boolean jj_3R_38()
  {
     Token xsp;
     xsp = jj_scanpos;
+    if (jj_3R_51()) {
+    jj_scanpos = xsp;
+    if (jj_3R_52()) {
+    jj_scanpos = xsp;
     if (jj_3R_53()) {
     jj_scanpos = xsp;
     if (jj_3R_54()) {
@@ -4320,11 +4243,7 @@ private boolean jj_3R_40()
     jj_scanpos = xsp;
     if (jj_3R_56()) {
     jj_scanpos = xsp;
-    if (jj_3R_57()) {
-    jj_scanpos = xsp;
-    if (jj_3R_58()) {
-    jj_scanpos = xsp;
-    if (jj_3R_59()) return true;
+    if (jj_3R_57()) return true;
     }
     }
     }
@@ -4334,27 +4253,21 @@ private boolean jj_3R_40()
     return false;
   }
 
-  private boolean jj_3R_53()
+  private boolean jj_3R_51()
  {
-    if (jj_3R_76()) return true;
+    if (jj_3R_74()) return true;
     return false;
   }
 
-  private boolean jj_3R_84()
+  private boolean jj_3R_82()
  {
     if (jj_scan_token(COMMIT)) return true;
     return false;
   }
 
-  private boolean jj_3R_65()
- {
-    if (jj_3R_86()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_49()
+  private boolean jj_3R_63()
  {
-    if (jj_3R_71()) return true;
+    if (jj_3R_84()) return true;
     return false;
   }
 
@@ -4369,7 +4282,7 @@ private boolean jj_3R_49()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[85];
+  final private int[] jj_la1 = new int[84];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -4379,15 +4292,15 @@ private boolean jj_3R_49()
 	   jj_la1_init_2();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x8000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x40000000,0x40000000,0x40000000,0x40000000,0x40000000,0x0,0x40000000,0x40000000,0x40000000,0x40000000,0x0,0x40000000,0x40000000,0x0,0x0,0x40000000,0x380000,0x0,0x0,0x0,0x0,};
+	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x8000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x380000,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x80,0x20000000,0x18000000,0x38000000,0x80,0x20000000,0x18000000,0x38000000,0x400,0x200,0x104,0x40,0x40,0x40,0x40,0x3e07800,0x100,0x100,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x3c00000,0x6800,0x0,0x10000000,0x8000000,0x18000000,0x0,0xc0000000,0x6100,0x40,0x6000,0xc0000000,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x10,0x0,0x0,0x0,0x10,0x0,0x0,0x0,};
+	   jj_la1_1 = new int[] {0x40,0x10000000,0xc000000,0x1c000000,0x40,0x10000000,0xc000000,0x1c000000,0x200,0x100,0x82,0x20,0x20,0x20,0x20,0x1f03c00,0x80,0x80,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x1e00000,0x3400,0x0,0x8000000,0x4000000,0xc000000,0x0,0x60000000,0x3080,0x20,0x3000,0x60000000,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x20,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x8,0x0,0x20,0x0,0x8,0x0,0x0,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x3d0,0x0,0x0,0x0,0x3d0,0x0,0x0,0x3d0,0x0,0x0,0x0,0x0,0x0,0x1d0,0x3d0,0x7d0,0x7d2,0x307d0,0x307d0,0x307d2,0x7d0,0x7d2,0x0,0x0,0x5d2,0x0,0x0,0x0,0x20,0x0,0x3d0,0x0,0x0,0x0,0x100,0x3d0,0x3c0,0x20,0x3c0,0x50,0x20,0x50,0x50,0x20,0x50,0x50,0x3c0,0x20,0x3c0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x20,0x20,0x5d2,};
+	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x1e8,0x0,0x0,0x0,0x1e8,0x0,0x0,0x1e8,0x0,0x0,0x0,0x0,0x0,0xe8,0x1e8,0x3e8,0x3e9,0x183e8,0x183e8,0x183e9,0x3e8,0x3e9,0x0,0x0,0x2e9,0x0,0x0,0x0,0x10,0x0,0x1e8,0x0,0x0,0x0,0x80,0x1e8,0x1e0,0x10,0x1e0,0x28,0x10,0x28,0x28,0x10,0x28,0x28,0x1e0,0x10,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x10,0x10,};
 	}
-  final private JJCalls[] jj_2_rtns = new JJCalls[29];
+  final private JJCalls[] jj_2_rtns = new JJCalls[28];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
@@ -4402,7 +4315,7 @@ public Grammar(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4418,7 +4331,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4429,7 +4342,7 @@ public Grammar(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4449,7 +4362,7 @@ public void ReInit(java.io.Reader stream) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4459,7 +4372,7 @@ public Grammar(GrammarTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4470,7 +4383,7 @@ public void ReInit(GrammarTokenManager tm) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4596,12 +4509,12 @@ private void jj_add_error_token(int kind, int pos) {
   /** Generate ParseException. */
   public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[82];
+	 boolean[] la1tokens = new boolean[81];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 85; i++) {
+	 for (int i = 0; i < 84; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4616,7 +4529,7 @@ public ParseException generateParseException() {
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 82; i++) {
+	 for (int i = 0; i < 81; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
@@ -4651,7 +4564,7 @@ final public void disable_tracing() {
 
   private void jj_rescan_token() {
 	 jj_rescan = true;
-	 for (int i = 0; i < 29; i++) {
+	 for (int i = 0; i < 28; i++) {
 	   try {
 		 JJCalls p = jj_2_rtns[i];
 
@@ -4687,7 +4600,6 @@ private void jj_rescan_token() {
 			   case 25: jj_3_26(); break;
 			   case 26: jj_3_27(); break;
 			   case 27: jj_3_28(); break;
-			   case 28: jj_3_29(); break;
 			 }
 		   }
 		   p = p.next;
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
index 50ca3c61..7bdb7f80 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
@@ -65,103 +65,101 @@ public interface GrammarConstants {
   /** RegularExpression Id. */
   int WITH = 29;
   /** RegularExpression Id. */
-  int AS_OF = 30;
+  int OPEN_BRACE = 30;
   /** RegularExpression Id. */
-  int OPEN_BRACE = 31;
+  int CLOSE_BRACE = 31;
   /** RegularExpression Id. */
-  int CLOSE_BRACE = 32;
+  int COLON = 32;
   /** RegularExpression Id. */
-  int COLON = 33;
+  int OPEN_PARENTHESES = 33;
   /** RegularExpression Id. */
-  int OPEN_PARENTHESES = 34;
+  int CLOSE_PARENTHESES = 34;
   /** RegularExpression Id. */
-  int CLOSE_PARENTHESES = 35;
+  int OPEN_BRACKET = 35;
   /** RegularExpression Id. */
-  int OPEN_BRACKET = 36;
+  int CLOSE_BRACKET = 36;
   /** RegularExpression Id. */
-  int CLOSE_BRACKET = 37;
+  int TIMESTAMP = 37;
   /** RegularExpression Id. */
-  int TIMESTAMP = 38;
+  int WHERE = 38;
   /** RegularExpression Id. */
-  int WHERE = 39;
+  int RESERVED_IDENTIFIER = 39;
   /** RegularExpression Id. */
-  int RESERVED_IDENTIFIER = 40;
+  int CONJUNCTION = 40;
   /** RegularExpression Id. */
-  int CONJUNCTION = 41;
+  int DISJUNCTION = 41;
   /** RegularExpression Id. */
-  int DISJUNCTION = 42;
+  int UNARY_OPERATOR = 42;
   /** RegularExpression Id. */
-  int UNARY_OPERATOR = 43;
+  int BINARY_OPERATOR = 43;
   /** RegularExpression Id. */
-  int BINARY_OPERATOR = 44;
+  int OPEN_ANGLE_BRACKET = 44;
   /** RegularExpression Id. */
-  int OPEN_ANGLE_BRACKET = 45;
+  int CLOSE_ANGLE_BRACKET = 45;
   /** RegularExpression Id. */
-  int CLOSE_ANGLE_BRACKET = 46;
+  int EQUALS = 46;
   /** RegularExpression Id. */
-  int EQUALS = 47;
+  int NOT_EQUALS = 47;
   /** RegularExpression Id. */
-  int NOT_EQUALS = 48;
+  int GREATER_THAN = 48;
   /** RegularExpression Id. */
-  int GREATER_THAN = 49;
+  int GREATER_THAN_OR_EQUALS = 49;
   /** RegularExpression Id. */
-  int GREATER_THAN_OR_EQUALS = 50;
+  int LESS_THAN = 50;
   /** RegularExpression Id. */
-  int LESS_THAN = 51;
+  int LESS_THAN_OR_EQUALS = 51;
   /** RegularExpression Id. */
-  int LESS_THAN_OR_EQUALS = 52;
+  int LINKS_TO = 52;
   /** RegularExpression Id. */
-  int LINKS_TO = 53;
+  int REGEX = 53;
   /** RegularExpression Id. */
-  int REGEX = 54;
+  int NOT_REGEX = 54;
   /** RegularExpression Id. */
-  int NOT_REGEX = 55;
+  int LIKE = 55;
   /** RegularExpression Id. */
-  int LIKE = 56;
+  int NOT_LIKE = 56;
   /** RegularExpression Id. */
-  int NOT_LIKE = 57;
+  int BETWEEN = 57;
   /** RegularExpression Id. */
-  int BETWEEN = 58;
+  int PAGE = 58;
   /** RegularExpression Id. */
-  int PAGE = 59;
+  int SIZE = 59;
   /** RegularExpression Id. */
-  int SIZE = 60;
+  int ORDER = 60;
   /** RegularExpression Id. */
-  int ORDER = 61;
+  int ASC = 61;
   /** RegularExpression Id. */
-  int ASC = 62;
+  int DESC = 62;
   /** RegularExpression Id. */
-  int DESC = 63;
+  int PIPE = 63;
   /** RegularExpression Id. */
-  int PIPE = 64;
+  int QUOTED_STRING = 64;
   /** RegularExpression Id. */
-  int QUOTED_STRING = 65;
+  int DOUBLE_QUOTED_STRING = 65;
   /** RegularExpression Id. */
-  int DOUBLE_QUOTED_STRING = 66;
+  int SINGLE_QUOTED_STRING = 66;
   /** RegularExpression Id. */
-  int SINGLE_QUOTED_STRING = 67;
+  int NUMERIC = 67;
   /** RegularExpression Id. */
-  int NUMERIC = 68;
+  int COMMA = 68;
   /** RegularExpression Id. */
-  int COMMA = 69;
+  int SIGNED_INTEGER = 69;
   /** RegularExpression Id. */
-  int SIGNED_INTEGER = 70;
+  int SIGNED_DECIMAL = 70;
   /** RegularExpression Id. */
-  int SIGNED_DECIMAL = 71;
+  int ALPHANUMERIC = 71;
   /** RegularExpression Id. */
-  int ALPHANUMERIC = 72;
+  int PERIOD_SEPARATED_STRING = 72;
   /** RegularExpression Id. */
-  int PERIOD_SEPARATED_STRING = 73;
+  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 73;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 74;
+  int NON_ALPHANUMERIC = 74;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC = 75;
+  int LETTER = 75;
   /** RegularExpression Id. */
-  int LETTER = 76;
+  int DIGIT = 76;
   /** RegularExpression Id. */
-  int DIGIT = 77;
-  /** RegularExpression Id. */
-  int PERIOD = 78;
+  int PERIOD = 77;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -198,7 +196,6 @@ public interface GrammarConstants {
     "\"as\"",
     "\"for\"",
     "\"with\"",
-    "\"as of\"",
     "\"{\"",
     "\"}\"",
     "\":\"",
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
index eece9b14..fef8f3bb 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
@@ -55,40 +55,40 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 2;
          return jjMoveNfa_0(5, 0);
       case 10:
-         jjmatchedKind = 79;
+         jjmatchedKind = 78;
          return jjMoveNfa_0(5, 0);
       case 32:
          jjmatchedKind = 1;
          return jjMoveNfa_0(5, 0);
       case 36:
-         return jjMoveStringLiteralDfa1_0(0x10000000000L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000L);
       case 40:
-         jjmatchedKind = 34;
+         jjmatchedKind = 33;
          return jjMoveNfa_0(5, 0);
       case 41:
-         jjmatchedKind = 35;
+         jjmatchedKind = 34;
          return jjMoveNfa_0(5, 0);
       case 44:
-         jjmatchedKind = 69;
+         jjmatchedKind = 68;
          return jjMoveNfa_0(5, 0);
       case 58:
-         jjmatchedKind = 33;
+         jjmatchedKind = 32;
          return jjMoveNfa_0(5, 0);
       case 60:
-         jjmatchedKind = 45;
+         jjmatchedKind = 44;
          return jjMoveNfa_0(5, 0);
       case 61:
-         jjmatchedKind = 81;
+         jjmatchedKind = 80;
          return jjMoveNfa_0(5, 0);
       case 62:
-         jjmatchedKind = 46;
+         jjmatchedKind = 45;
          return jjMoveNfa_0(5, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x4000000048210008L);
+         return jjMoveStringLiteralDfa1_0(0x2000000008210008L);
       case 67:
          return jjMoveStringLiteralDfa1_0(0x100040L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x8000000000008000L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000008000L);
       case 70:
          return jjMoveStringLiteralDfa1_0(0x12002000L);
       case 71:
@@ -96,15 +96,15 @@ private int jjMoveStringLiteralDfa0_0(){
       case 73:
          return jjMoveStringLiteralDfa1_0(0x1800200L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x100000000000400L);
+         return jjMoveStringLiteralDfa1_0(0x80000000000400L);
       case 79:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x1000000000000000L);
       case 80:
-         return jjMoveStringLiteralDfa1_0(0x800000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x400000000000000L);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x40000000400020L);
+         return jjMoveStringLiteralDfa1_0(0x20000000400020L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0x10000000000c1010L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000c1010L);
       case 84:
          return jjMoveStringLiteralDfa1_0(0x4000000L);
       case 85:
@@ -112,22 +112,22 @@ private int jjMoveStringLiteralDfa0_0(){
       case 86:
          return jjMoveStringLiteralDfa1_0(0x20000L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x8020000000L);
+         return jjMoveStringLiteralDfa1_0(0x4020000000L);
       case 91:
-         jjmatchedKind = 36;
+         jjmatchedKind = 35;
          return jjMoveNfa_0(5, 0);
       case 93:
-         jjmatchedKind = 37;
+         jjmatchedKind = 36;
          return jjMoveNfa_0(5, 0);
       case 95:
-         jjmatchedKind = 80;
+         jjmatchedKind = 79;
          return jjMoveNfa_0(5, 0);
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x4000000048210008L);
+         return jjMoveStringLiteralDfa1_0(0x2000000008210008L);
       case 99:
          return jjMoveStringLiteralDfa1_0(0x100040L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x8000000000008000L);
+         return jjMoveStringLiteralDfa1_0(0x4000000000008000L);
       case 102:
          return jjMoveStringLiteralDfa1_0(0x12002000L);
       case 103:
@@ -135,15 +135,15 @@ private int jjMoveStringLiteralDfa0_0(){
       case 105:
          return jjMoveStringLiteralDfa1_0(0x1800200L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x100000000000400L);
+         return jjMoveStringLiteralDfa1_0(0x80000000000400L);
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x1000000000000000L);
       case 112:
-         return jjMoveStringLiteralDfa1_0(0x800000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x400000000000000L);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x40000000400020L);
+         return jjMoveStringLiteralDfa1_0(0x20000000400020L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x10000000000c1010L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000c1010L);
       case 116:
          return jjMoveStringLiteralDfa1_0(0x4000000L);
       case 117:
@@ -151,15 +151,15 @@ private int jjMoveStringLiteralDfa0_0(){
       case 118:
          return jjMoveStringLiteralDfa1_0(0x20000L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x8020000000L);
+         return jjMoveStringLiteralDfa1_0(0x4020000000L);
       case 123:
-         jjmatchedKind = 31;
+         jjmatchedKind = 30;
          return jjMoveNfa_0(5, 0);
       case 124:
-         jjmatchedKind = 64;
+         jjmatchedKind = 63;
          return jjMoveNfa_0(5, 0);
       case 125:
-         jjmatchedKind = 32;
+         jjmatchedKind = 31;
          return jjMoveNfa_0(5, 0);
       default :
          return jjMoveNfa_0(5, 0);
@@ -173,17 +173,17 @@ private int jjMoveStringLiteralDfa1_0(long active0){
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L);
       case 66:
          return jjMoveStringLiteralDfa2_0(active0, 0x200000L);
       case 68:
          return jjMoveStringLiteralDfa2_0(active0, 0x8L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x804000000046f030L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x402000000046f030L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1100010020000400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x880008020000400L);
       case 76:
          return jjMoveStringLiteralDfa2_0(active0, 0x40L);
       case 78:
@@ -201,30 +201,30 @@ private int jjMoveStringLiteralDfa1_0(long active0){
          }
          return jjMoveStringLiteralDfa2_0(active0, 0x10100000L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000002000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000000002000000L);
       case 83:
          if ((active0 & 0x8000000L) != 0L)
          {
             jjmatchedKind = 27;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000040000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L);
       case 84:
          return jjMoveStringLiteralDfa2_0(active0, 0x80000L);
       case 85:
          return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L);
       case 98:
          return jjMoveStringLiteralDfa2_0(active0, 0x200000L);
       case 100:
          return jjMoveStringLiteralDfa2_0(active0, 0x8L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x804000000046f030L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x402000000046f030L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1100010020000400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x880008020000400L);
       case 108:
          return jjMoveStringLiteralDfa2_0(active0, 0x40L);
       case 110:
@@ -242,14 +242,14 @@ private int jjMoveStringLiteralDfa1_0(long active0){
          }
          return jjMoveStringLiteralDfa2_0(active0, 0x10100000L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000002000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000000002000000L);
       case 115:
          if ((active0 & 0x8000000L) != 0L)
          {
             jjmatchedKind = 27;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000040000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L);
       case 116:
          return jjMoveStringLiteralDfa2_0(active0, 0x80000L);
       case 117:
@@ -268,14 +268,12 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0){
    }
    switch(curChar)
    {
-      case 32:
-         return jjMoveStringLiteralDfa3_0(active0, 0x40000000L);
       case 65:
          return jjMoveStringLiteralDfa3_0(active0, 0xc0000L);
       case 67:
-         if ((active0 & 0x4000000000000000L) != 0L)
+         if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 61;
             jjmatchedPos = 2;
          }
          break;
@@ -285,13 +283,13 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0){
             jjmatchedKind = 3;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000010000010000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000008000010000L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000040L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000040L);
       case 71:
-         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x420000000000000L);
       case 75:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L);
       case 76:
          return jjMoveStringLiteralDfa3_0(active0, 0x1800L);
       case 77:
@@ -308,7 +306,7 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0){
          }
          return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
       case 83:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000008200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000008200L);
       case 84:
          if ((active0 & 0x10L) != 0L)
          {
@@ -324,13 +322,13 @@ else if ((active0 & 0x4000L) != 0L)
       case 86:
          return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
       case 90:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L);
       case 97:
          return jjMoveStringLiteralDfa3_0(active0, 0xc0000L);
       case 99:
-         if ((active0 & 0x4000000000000000L) != 0L)
+         if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 61;
             jjmatchedPos = 2;
          }
          break;
@@ -340,13 +338,13 @@ else if ((active0 & 0x4000L) != 0L)
             jjmatchedKind = 3;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000010000010000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000008000010000L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000040L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000040L);
       case 103:
-         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x420000000000000L);
       case 107:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L);
       case 108:
          return jjMoveStringLiteralDfa3_0(active0, 0x1800L);
       case 109:
@@ -363,7 +361,7 @@ else if ((active0 & 0x4000L) != 0L)
          }
          return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
       case 115:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000008200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000008200L);
       case 116:
          if ((active0 & 0x10L) != 0L)
          {
@@ -379,7 +377,7 @@ else if ((active0 & 0x4000L) != 0L)
       case 118:
          return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
       case 122:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L);
       default :
          break;
    }
@@ -395,38 +393,38 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0){
    switch(curChar)
    {
       case 36:
-         if ((active0 & 0x10000000000L) != 0L)
+         if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 40;
+            jjmatchedKind = 39;
             jjmatchedPos = 3;
          }
          break;
       case 65:
          return jjMoveStringLiteralDfa4_0(active0, 0x40L);
       case 67:
-         if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active0 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 62;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0xa000L);
       case 69:
-         if ((active0 & 0x100000000000000L) != 0L)
+         if ((active0 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 55;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x800000000000000L) != 0L)
+         else if ((active0 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 58;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x1000000000000000L) != 0L)
+         else if ((active0 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 59;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2040000000401200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1020000000401200L);
       case 71:
          return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
       case 72:
@@ -458,35 +456,35 @@ else if ((active0 & 0x1000000000000000L) != 0L)
             jjmatchedKind = 24;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000020L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20L);
       case 82:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000240000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000240000L);
       case 97:
          return jjMoveStringLiteralDfa4_0(active0, 0x40L);
       case 99:
-         if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active0 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 62;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0xa000L);
       case 101:
-         if ((active0 & 0x100000000000000L) != 0L)
+         if ((active0 & 0x80000000000000L) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 55;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x800000000000000L) != 0L)
+         else if ((active0 & 0x400000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 58;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x1000000000000000L) != 0L)
+         else if ((active0 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 59;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2040000000401200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1020000000401200L);
       case 103:
          return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
       case 104:
@@ -518,9 +516,9 @@ else if ((active0 & 0x1000000000000000L) != 0L)
             jjmatchedKind = 24;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000020L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20L);
       case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000240000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000240000L);
       default :
          break;
    }
@@ -543,18 +541,13 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0){
             jjmatchedKind = 19;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x8000000000L) != 0L)
+         else if ((active0 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 38;
             jjmatchedPos = 4;
          }
          break;
       case 70:
-         if ((active0 & 0x40000000L) != 0L)
-         {
-            jjmatchedKind = 30;
-            jjmatchedPos = 4;
-         }
          return jjMoveStringLiteralDfa5_0(active0, 0x20000L);
       case 72:
          if ((active0 & 0x2000L) != 0L)
@@ -573,7 +566,7 @@ else if ((active0 & 0x8000000000L) != 0L)
             jjmatchedKind = 6;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000408200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000408200L);
       case 84:
          if ((active0 & 0x10000L) != 0L)
          {
@@ -589,9 +582,9 @@ else if ((active0 & 0x200000L) != 0L)
       case 86:
          return jjMoveStringLiteralDfa5_0(active0, 0x20L);
       case 88:
-         if ((active0 & 0x40000000000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 53;
             jjmatchedPos = 4;
          }
          break;
@@ -603,18 +596,13 @@ else if ((active0 & 0x200000L) != 0L)
             jjmatchedKind = 19;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x8000000000L) != 0L)
+         else if ((active0 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 38;
             jjmatchedPos = 4;
          }
          break;
       case 102:
-         if ((active0 & 0x40000000L) != 0L)
-         {
-            jjmatchedKind = 30;
-            jjmatchedPos = 4;
-         }
          return jjMoveStringLiteralDfa5_0(active0, 0x20000L);
       case 104:
          if ((active0 & 0x2000L) != 0L)
@@ -633,7 +621,7 @@ else if ((active0 & 0x8000000000L) != 0L)
             jjmatchedKind = 6;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000408200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000408200L);
       case 116:
          if ((active0 & 0x10000L) != 0L)
          {
@@ -649,9 +637,9 @@ else if ((active0 & 0x200000L) != 0L)
       case 118:
          return jjMoveStringLiteralDfa5_0(active0, 0x20L);
       case 120:
-         if ((active0 & 0x40000000000000L) != 0L)
+         if ((active0 & 0x20000000000000L) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 53;
             jjmatchedPos = 4;
          }
          break;
@@ -670,7 +658,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0){
    switch(curChar)
    {
       case 32:
-         return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000000000000L);
       case 69:
          if ((active0 & 0x20L) != 0L)
          {
@@ -790,9 +778,9 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0){
    switch(curChar)
    {
       case 66:
-         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000008000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x1000000000008000L);
       case 98:
-         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000008000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x1000000000008000L);
       default :
          break;
    }
@@ -815,9 +803,9 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0){
          }
          break;
       case 89:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active0 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 60;
             jjmatchedPos = 7;
          }
          break;
@@ -829,9 +817,9 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0){
          }
          break;
       case 121:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active0 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 60;
             jjmatchedPos = 7;
          }
          break;
@@ -877,7 +865,7 @@ private int jjMoveNfa_0(int startState, int curPos)
    catch(java.io.IOException e) { throw new Error("Internal Error"); }
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 261;
+   jjnewStateCnt = 265;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -895,19 +883,19 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 5:
                   if ((0xdfffecfeffffd9ffL & l) != 0L)
                   {
-                     if (kind > 74)
-                        kind = 74;
+                     if (kind > 73)
+                        kind = 73;
                      { jjCheckNAddTwoStates(20, 21); }
                   }
                   else if (curChar == 61)
                   {
-                     if (kind > 43)
-                        kind = 43;
+                     if (kind > 42)
+                        kind = 42;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 72)
-                        kind = 72;
+                     if (kind > 71)
+                        kind = 71;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0x280000000000L & l) != 0L)
@@ -917,7 +905,7 @@ else if (curChar == 39)
                   else if (curChar == 34)
                      { jjCheckNAddStates(12, 15); }
                   else if (curChar == 62)
-                     { jjCheckNAddTwoStates(13, 79); }
+                     { jjCheckNAddTwoStates(13, 83); }
                   else if (curChar == 60)
                      { jjCheckNAdd(13); }
                   else if (curChar == 33)
@@ -926,13 +914,13 @@ else if (curChar == 61)
                      { jjCheckNAdd(13); }
                   else if (curChar == 38)
                   {
-                     if (kind > 41)
-                        kind = 41;
+                     if (kind > 40)
+                        kind = 40;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 68)
-                        kind = 68;
+                     if (kind > 67)
+                        kind = 67;
                      { jjCheckNAddStates(16, 21); }
                   }
                   else if (curChar == 45)
@@ -941,28 +929,28 @@ else if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 8;
                   break;
                case 8:
-                  if (curChar == 38 && kind > 41)
-                     kind = 41;
+                  if (curChar == 38 && kind > 40)
+                     kind = 40;
                   break;
                case 9:
                   if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 8;
                   break;
                case 10:
-                  if (curChar == 38 && kind > 41)
-                     kind = 41;
+                  if (curChar == 38 && kind > 40)
+                     kind = 40;
                   break;
                case 13:
-                  if (curChar == 61 && kind > 43)
-                     kind = 43;
+                  if (curChar == 61 && kind > 42)
+                     kind = 42;
                   break;
                case 14:
                   if (curChar == 61)
                      { jjCheckNAdd(13); }
                   break;
                case 15:
-                  if (curChar == 61 && kind > 43)
-                     kind = 43;
+                  if (curChar == 61 && kind > 42)
+                     kind = 42;
                   break;
                case 16:
                   if (curChar == 33)
@@ -973,8 +961,8 @@ else if (curChar == 38)
                      { jjCheckNAdd(13); }
                   break;
                case 18:
-                  if (curChar == 62 && kind > 53)
-                     kind = 53;
+                  if (curChar == 62 && kind > 52)
+                     kind = 52;
                   break;
                case 19:
                   if (curChar == 45)
@@ -983,210 +971,214 @@ else if (curChar == 38)
                case 20:
                   if ((0xdfffecfeffffd9ffL & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 21:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 78:
-                  if (curChar == 62)
-                     { jjCheckNAddTwoStates(13, 79); }
-                  break;
-               case 79:
-                  if (curChar == 60 && kind > 44)
-                     kind = 44;
+                  if (curChar == 32)
+                     jjstateSet[jjnewStateCnt++] = 77;
                   break;
                case 82:
+                  if (curChar == 62)
+                     { jjCheckNAddTwoStates(13, 83); }
+                  break;
                case 83:
-                  { jjCheckNAddStates(22, 24); }
+                  if (curChar == 60 && kind > 43)
+                     kind = 43;
                   break;
                case 86:
                case 87:
+                  { jjCheckNAddStates(22, 24); }
+                  break;
+               case 90:
+               case 91:
                   { jjCheckNAddStates(25, 27); }
                   break;
-               case 89:
+               case 93:
                   if (curChar == 34)
                      { jjCheckNAddStates(12, 15); }
                   break;
-               case 91:
+               case 95:
                   { jjCheckNAddStates(28, 30); }
                   break;
-               case 92:
+               case 96:
                   if ((0xfffffffbffffffffL & l) != 0L)
                      { jjCheckNAddStates(28, 30); }
                   break;
-               case 93:
-                  if (curChar == 34 && kind > 65)
-                     kind = 65;
+               case 97:
+                  if (curChar == 34 && kind > 64)
+                     kind = 64;
                   break;
-               case 95:
+               case 99:
                   { jjCheckNAddStates(31, 33); }
                   break;
-               case 96:
+               case 100:
                   if ((0xfffffffbffffffffL & l) != 0L)
                      { jjCheckNAddStates(31, 33); }
                   break;
-               case 97:
-                  if (curChar == 34 && kind > 66)
-                     kind = 66;
-                  break;
-               case 100:
                case 101:
-                  { jjCheckNAddStates(34, 36); }
+                  if (curChar == 34 && kind > 65)
+                     kind = 65;
                   break;
                case 104:
                case 105:
-                  { jjCheckNAddStates(37, 39); }
+                  { jjCheckNAddStates(34, 36); }
                   break;
+               case 108:
                case 109:
-               case 110:
-                  { jjCheckNAddStates(40, 42); }
+                  { jjCheckNAddStates(37, 39); }
                   break;
                case 113:
                case 114:
+                  { jjCheckNAddStates(40, 42); }
+                  break;
+               case 117:
+               case 118:
                   { jjCheckNAddStates(43, 45); }
                   break;
-               case 116:
+               case 120:
                   if (curChar == 39)
                      { jjCheckNAddStates(8, 11); }
                   break;
-               case 118:
+               case 122:
                   { jjCheckNAddStates(46, 48); }
                   break;
-               case 119:
+               case 123:
                   if ((0xffffff7fffffffffL & l) != 0L)
                      { jjCheckNAddStates(46, 48); }
                   break;
-               case 120:
-                  if (curChar == 39 && kind > 65)
-                     kind = 65;
+               case 124:
+                  if (curChar == 39 && kind > 64)
+                     kind = 64;
                   break;
-               case 122:
+               case 126:
                   { jjCheckNAddStates(49, 51); }
                   break;
-               case 123:
+               case 127:
                   if ((0xffffff7fffffffffL & l) != 0L)
                      { jjCheckNAddStates(49, 51); }
                   break;
-               case 124:
-                  if (curChar == 39 && kind > 67)
-                     kind = 67;
+               case 128:
+                  if (curChar == 39 && kind > 66)
+                     kind = 66;
                   break;
-               case 125:
+               case 129:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 67)
+                     kind = 67;
                   { jjCheckNAddStates(16, 21); }
                   break;
-               case 126:
+               case 130:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
-                  { jjCheckNAdd(126); }
+                  if (kind > 67)
+                     kind = 67;
+                  { jjCheckNAdd(130); }
                   break;
-               case 127:
+               case 131:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 70)
-                     kind = 70;
-                  { jjCheckNAdd(127); }
+                  if (kind > 69)
+                     kind = 69;
+                  { jjCheckNAdd(131); }
                   break;
-               case 128:
+               case 132:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(128, 129); }
+                     { jjCheckNAddTwoStates(132, 133); }
                   break;
-               case 129:
+               case 133:
                   if (curChar == 46)
-                     { jjCheckNAdd(130); }
+                     { jjCheckNAdd(134); }
                   break;
-               case 130:
+               case 134:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
-                  { jjCheckNAdd(130); }
+                  if (kind > 70)
+                     kind = 70;
+                  { jjCheckNAdd(134); }
                   break;
-               case 131:
+               case 135:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(131, 132); }
+                     { jjCheckNAddTwoStates(135, 136); }
                   break;
-               case 132:
+               case 136:
                   if (curChar == 46)
-                     { jjCheckNAdd(133); }
+                     { jjCheckNAdd(137); }
                   break;
-               case 133:
+               case 137:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
-                  { jjCheckNAddTwoStates(133, 134); }
+                  if (kind > 72)
+                     kind = 72;
+                  { jjCheckNAddTwoStates(137, 138); }
                   break;
-               case 134:
+               case 138:
                   if (curChar == 46)
                      { jjCheckNAddStates(52, 54); }
                   break;
-               case 135:
+               case 139:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(136); }
+                     { jjCheckNAdd(140); }
                   break;
-               case 136:
+               case 140:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(136, 137); }
+                     { jjCheckNAddTwoStates(140, 141); }
                   break;
-               case 137:
+               case 141:
                   if (curChar == 46)
-                     { jjCheckNAdd(138); }
+                     { jjCheckNAdd(142); }
                   break;
-               case 138:
+               case 142:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
-                  { jjCheckNAddTwoStates(134, 138); }
+                  if (kind > 72)
+                     kind = 72;
+                  { jjCheckNAddTwoStates(138, 142); }
                   break;
-               case 139:
+               case 143:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
-                  { jjCheckNAddTwoStates(134, 139); }
+                  if (kind > 72)
+                     kind = 72;
+                  { jjCheckNAddTwoStates(138, 143); }
                   break;
-               case 140:
+               case 144:
                   if ((0x280000000000L & l) != 0L)
                      { jjCheckNAddStates(5, 7); }
                   break;
-               case 141:
+               case 145:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 71)
+                     kind = 71;
                   { jjCheckNAddStates(0, 4); }
                   break;
-               case 142:
+               case 146:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
-                  { jjCheckNAdd(142); }
+                  if (kind > 71)
+                     kind = 71;
+                  { jjCheckNAdd(146); }
                   break;
-               case 143:
+               case 147:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
-                  { jjCheckNAddTwoStates(143, 134); }
+                  if (kind > 72)
+                     kind = 72;
+                  { jjCheckNAddTwoStates(147, 138); }
                   break;
-               case 201:
-                  if (curChar == 50 && kind > 53)
-                     kind = 53;
+               case 205:
+                  if (curChar == 50 && kind > 52)
+                     kind = 52;
                   break;
                default : break;
             }
@@ -1202,14 +1194,14 @@ else if (curChar < 128)
                case 5:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 72)
-                        kind = 72;
+                     if (kind > 71)
+                        kind = 71;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0xf800000150000001L & l) != 0L)
                   {
-                     if (kind > 74)
-                        kind = 74;
+                     if (kind > 73)
+                        kind = 73;
                      { jjCheckNAddTwoStates(20, 21); }
                   }
                   if ((0x40000000400000L & l) != 0L)
@@ -1218,28 +1210,28 @@ else if ((0x100000001000L & l) != 0L)
                      { jjCheckNAddStates(59, 65); }
                   else if ((0x400000004000L & l) != 0L)
                      { jjCheckNAddStates(66, 71); }
-                  else if ((0x800000008000L & l) != 0L)
-                     { jjCheckNAddTwoStates(6, 77); }
                   else if ((0x200000002L & l) != 0L)
-                     { jjAddStates(72, 73); }
+                     { jjAddStates(72, 74); }
+                  else if ((0x800000008000L & l) != 0L)
+                     { jjCheckNAddTwoStates(6, 73); }
                   else if ((0x8000000080L & l) != 0L)
-                     { jjCheckNAddStates(74, 77); }
+                     { jjCheckNAddStates(75, 78); }
                   else if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(78, 79); }
+                     { jjAddStates(79, 80); }
                   else if ((0x400000004L & l) != 0L)
-                     { jjAddStates(80, 81); }
+                     { jjAddStates(81, 82); }
                   else if ((0x20000000200L & l) != 0L)
                      { jjCheckNAdd(6); }
                   else if ((0x1000000010L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 4;
                   else if (curChar == 96)
-                     { jjCheckNAddStates(82, 85); }
+                     { jjCheckNAddStates(83, 86); }
                   else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 11;
                   break;
                case 0:
-                  if ((0x8000000080L & l) != 0L && kind > 38)
-                     kind = 38;
+                  if ((0x8000000080L & l) != 0L && kind > 37)
+                     kind = 37;
                   break;
                case 1:
                   if ((0x400000004000L & l) != 0L)
@@ -1258,16 +1250,16 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 3;
                   break;
                case 6:
-                  if ((0x400000004000L & l) != 0L && kind > 38)
-                     kind = 38;
+                  if ((0x400000004000L & l) != 0L && kind > 37)
+                     kind = 37;
                   break;
                case 7:
                   if ((0x20000000200L & l) != 0L)
                      { jjCheckNAdd(6); }
                   break;
                case 11:
-                  if (curChar == 124 && kind > 42)
-                     kind = 42;
+                  if (curChar == 124 && kind > 41)
+                     kind = 41;
                   break;
                case 12:
                   if (curChar == 124)
@@ -1276,28 +1268,28 @@ else if (curChar == 124)
                case 20:
                   if ((0xf800000150000001L & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 21:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
                case 22:
                   if ((0x400000004L & l) != 0L)
-                     { jjAddStates(80, 81); }
+                     { jjAddStates(81, 82); }
                   break;
                case 23:
-                  if ((0x80000000800000L & l) != 0L && kind > 44)
-                     kind = 44;
+                  if ((0x80000000800000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 24:
-                  if ((0x400000004000L & l) != 0L && kind > 44)
-                     kind = 44;
+                  if ((0x400000004000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 25:
                   if ((0x2000000020L & l) != 0L)
@@ -1321,16 +1313,16 @@ else if (curChar == 124)
                   break;
                case 30:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(78, 79); }
+                     { jjAddStates(79, 80); }
                   break;
                case 31:
-                  if ((0x8000000080000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x8000000080000L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 32:
                case 50:
-               case 145:
-               case 183:
+               case 149:
+               case 187:
                   if ((0x100000001000L & l) != 0L)
                      { jjCheckNAdd(31); }
                   break;
@@ -1347,19 +1339,19 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 34;
                   break;
                case 36:
-                  if ((0x2000000020000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x2000000020000L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 37:
                   if ((0x8000000080L & l) != 0L)
-                     { jjCheckNAddStates(74, 77); }
+                     { jjCheckNAddStates(75, 78); }
                   break;
                case 38:
-                  if ((0x400000004000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x400000004000L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 39:
-               case 176:
+               case 180:
                   if ((0x200000002L & l) != 0L)
                      { jjCheckNAdd(38); }
                   break;
@@ -1400,8 +1392,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 47;
                   break;
                case 49:
-                  if ((0x10000000100000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x10000000100000L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 51:
                   if ((0x200000002L & l) != 0L)
@@ -1480,240 +1472,240 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 68;
                   break;
                case 70:
-                  if ((0x2000000020L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x2000000020L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 71:
-               case 200:
+               case 204:
                   if ((0x10000000100000L & l) != 0L)
                      { jjCheckNAdd(70); }
                   break;
                case 72:
-                  if ((0x200000002L & l) != 0L)
-                     { jjAddStates(72, 73); }
+                  if ((0x800000008000L & l) != 0L)
+                     { jjCheckNAddTwoStates(6, 73); }
                   break;
                case 73:
-                  if ((0x10000000100000L & l) != 0L && kind > 38)
-                     kind = 38;
+                  if ((0x4000000040000L & l) != 0L && kind > 41)
+                     kind = 41;
                   break;
                case 74:
-                  if ((0x1000000010L & l) != 0L && kind > 41)
-                     kind = 41;
+                  if ((0x200000002L & l) != 0L)
+                     { jjAddStates(72, 74); }
                   break;
                case 75:
-                  if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 74;
+                  if ((0x10000000100000L & l) != 0L && kind > 37)
+                     kind = 37;
                   break;
                case 76:
-                  if ((0x800000008000L & l) != 0L)
-                     { jjCheckNAddTwoStates(6, 77); }
+                  if ((0x4000000040L & l) != 0L && kind > 37)
+                     kind = 37;
                   break;
                case 77:
-                  if ((0x4000000040000L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 76;
                   break;
-               case 81:
-                  if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 82;
+               case 79:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 78;
                   break;
-               case 82:
-                  { jjCheckNAddStates(22, 24); }
+               case 80:
+                  if ((0x1000000010L & l) != 0L && kind > 40)
+                     kind = 40;
                   break;
-               case 83:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(22, 24); }
+               case 81:
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 80;
                   break;
                case 85:
                   if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 86;
                   break;
                case 86:
-                  { jjCheckNAddStates(25, 27); }
+                  { jjCheckNAddStates(22, 24); }
                   break;
                case 87:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(25, 27); }
+                     { jjCheckNAddStates(22, 24); }
                   break;
-               case 90:
+               case 89:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 91;
+                     jjstateSet[jjnewStateCnt++] = 90;
                   break;
-               case 91:
-                  { jjCheckNAddStates(28, 30); }
+               case 90:
+                  { jjCheckNAddStates(25, 27); }
                   break;
-               case 92:
+               case 91:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(28, 30); }
+                     { jjCheckNAddStates(25, 27); }
                   break;
                case 94:
                   if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 95;
                   break;
                case 95:
-                  { jjCheckNAddStates(31, 33); }
+                  { jjCheckNAddStates(28, 30); }
                   break;
                case 96:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(31, 33); }
+                     { jjCheckNAddStates(28, 30); }
                   break;
                case 98:
-                  if (curChar == 96)
-                     { jjCheckNAddStates(82, 85); }
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 99;
                   break;
                case 99:
-                  if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 100;
+                  { jjCheckNAddStates(31, 33); }
                   break;
                case 100:
-                  { jjCheckNAddStates(34, 36); }
-                  break;
-               case 101:
-                  if ((0xfffffffeefffffffL & l) != 0L)
-                     { jjCheckNAddStates(34, 36); }
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     { jjCheckNAddStates(31, 33); }
                   break;
                case 102:
-                  if (curChar == 96 && kind > 65)
-                     kind = 65;
+                  if (curChar == 96)
+                     { jjCheckNAddStates(83, 86); }
                   break;
                case 103:
                   if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 104;
                   break;
                case 104:
-                  { jjCheckNAddStates(37, 39); }
+                  { jjCheckNAddStates(34, 36); }
                   break;
                case 105:
                   if ((0xfffffffeefffffffL & l) != 0L)
-                     { jjCheckNAddStates(37, 39); }
+                     { jjCheckNAddStates(34, 36); }
                   break;
                case 106:
-                  if (curChar == 96 && kind > 67)
-                     kind = 67;
+                  if (curChar == 96 && kind > 64)
+                     kind = 64;
                   break;
-               case 108:
+               case 107:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 109;
+                     jjstateSet[jjnewStateCnt++] = 108;
+                  break;
+               case 108:
+                  { jjCheckNAddStates(37, 39); }
                   break;
                case 109:
-                  { jjCheckNAddStates(40, 42); }
+                  if ((0xfffffffeefffffffL & l) != 0L)
+                     { jjCheckNAddStates(37, 39); }
                   break;
                case 110:
-                  if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(40, 42); }
+                  if (curChar == 96 && kind > 66)
+                     kind = 66;
                   break;
                case 112:
                   if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 113;
                   break;
                case 113:
-                  { jjCheckNAddStates(43, 45); }
+                  { jjCheckNAddStates(40, 42); }
                   break;
                case 114:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(43, 45); }
+                     { jjCheckNAddStates(40, 42); }
                   break;
-               case 117:
+               case 116:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 118;
+                     jjstateSet[jjnewStateCnt++] = 117;
                   break;
-               case 118:
-                  { jjCheckNAddStates(46, 48); }
+               case 117:
+                  { jjCheckNAddStates(43, 45); }
                   break;
-               case 119:
+               case 118:
                   if ((0xffffffffefffffffL & l) != 0L)
-                     { jjCheckNAddStates(46, 48); }
+                     { jjCheckNAddStates(43, 45); }
                   break;
                case 121:
                   if (curChar == 92)
                      jjstateSet[jjnewStateCnt++] = 122;
                   break;
                case 122:
-                  { jjCheckNAddStates(49, 51); }
+                  { jjCheckNAddStates(46, 48); }
                   break;
                case 123:
+                  if ((0xffffffffefffffffL & l) != 0L)
+                     { jjCheckNAddStates(46, 48); }
+                  break;
+               case 125:
+                  if (curChar == 92)
+                     jjstateSet[jjnewStateCnt++] = 126;
+                  break;
+               case 126:
+                  { jjCheckNAddStates(49, 51); }
+                  break;
+               case 127:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(49, 51); }
                   break;
-               case 139:
+               case 143:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
-                  { jjCheckNAddTwoStates(134, 139); }
+                  if (kind > 72)
+                     kind = 72;
+                  { jjCheckNAddTwoStates(138, 143); }
                   break;
-               case 141:
+               case 145:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 71)
+                     kind = 71;
                   { jjCheckNAddStates(0, 4); }
                   break;
-               case 142:
+               case 146:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
-                  { jjCheckNAdd(142); }
+                  if (kind > 71)
+                     kind = 71;
+                  { jjCheckNAdd(146); }
                   break;
-               case 143:
+               case 147:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
-                  { jjCheckNAddTwoStates(143, 134); }
+                  if (kind > 72)
+                     kind = 72;
+                  { jjCheckNAddTwoStates(147, 138); }
                   break;
-               case 144:
+               case 148:
                   if ((0x400000004000L & l) != 0L)
                      { jjCheckNAddStates(66, 71); }
                   break;
-               case 146:
-                  if ((0x200000002L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 145;
-                  break;
-               case 147:
-                  if ((0x20000000200000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 146;
-                  break;
-               case 148:
-                  if ((0x2000000020000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 147;
-                  break;
-               case 149:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 148;
-                  break;
                case 150:
-                  if (curChar == 95)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 149;
                   break;
                case 151:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x20000000200000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 150;
                   break;
                case 152:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x2000000020000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 151;
                   break;
                case 153:
-                  if ((0x100000001000000L & l) != 0L && kind > 55)
-                     kind = 55;
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 152;
                   break;
                case 154:
-               case 158:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAdd(153); }
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 153;
                   break;
                case 155:
-                  if ((0x8000000080L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 154;
                   break;
                case 156:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 155;
                   break;
                case 157:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 156;
+                  if ((0x100000001000000L & l) != 0L && kind > 54)
+                     kind = 54;
+                  break;
+               case 158:
+               case 162:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjCheckNAdd(157); }
                   break;
                case 159:
                   if ((0x8000000080L & l) != 0L)
@@ -1727,270 +1719,266 @@ else if (curChar == 124)
                   if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 160;
                   break;
-               case 162:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 161;
-                  break;
                case 163:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x8000000080L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 162;
                   break;
                case 164:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 163;
                   break;
                case 165:
-                  if ((0x2000000020L & l) != 0L && kind > 57)
-                     kind = 57;
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 164;
                   break;
                case 166:
-               case 169:
-                  if ((0x80000000800L & l) != 0L)
-                     { jjCheckNAdd(165); }
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 165;
                   break;
                case 167:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 166;
                   break;
                case 168:
-                  if ((0x100000001000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 167;
                   break;
+               case 169:
+                  if ((0x2000000020L & l) != 0L && kind > 56)
+                     kind = 56;
+                  break;
                case 170:
-                  if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 169;
+               case 173:
+                  if ((0x80000000800L & l) != 0L)
+                     { jjCheckNAdd(169); }
                   break;
                case 171:
-                  if ((0x100000001000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 170;
                   break;
                case 172:
-                  if (curChar == 95)
+                  if ((0x100000001000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 171;
                   break;
-               case 173:
-                  if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 172;
-                  break;
                case 174:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 173;
                   break;
                case 175:
                   if ((0x100000001000L & l) != 0L)
-                     { jjCheckNAddStates(59, 65); }
+                     jjstateSet[jjnewStateCnt++] = 174;
+                  break;
+               case 176:
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 175;
                   break;
                case 177:
-                  if ((0x10000000100L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 176;
                   break;
                case 178:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 177;
                   break;
                case 179:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 178;
-                  break;
-               case 180:
-                  if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 179;
+                  if ((0x100000001000L & l) != 0L)
+                     { jjCheckNAddStates(59, 65); }
                   break;
                case 181:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x10000000100L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 180;
                   break;
                case 182:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 181;
                   break;
+               case 183:
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 182;
+                  break;
                case 184:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 183;
                   break;
                case 185:
-                  if ((0x20000000200000L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 184;
                   break;
                case 186:
-                  if ((0x2000000020000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 185;
-                  break;
-               case 187:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 186;
+                     jjstateSet[jjnewStateCnt++] = 185;
                   break;
                case 188:
-                  if (curChar == 95)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 187;
                   break;
                case 189:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x20000000200000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 188;
                   break;
                case 190:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x2000000020000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 189;
                   break;
                case 191:
-                  if (curChar == 95)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 190;
                   break;
                case 192:
-                  if ((0x400000004000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 191;
                   break;
                case 193:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 192;
                   break;
                case 194:
-                  if ((0x10000000100L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 193;
                   break;
                case 195:
-                  if ((0x10000000100000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 194;
                   break;
                case 196:
-                  if (curChar == 95)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 195;
                   break;
                case 197:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 196;
                   break;
                case 198:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x10000000100L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 197;
                   break;
                case 199:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 198;
                   break;
+               case 200:
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 199;
+                  break;
+               case 201:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 200;
+                  break;
                case 202:
                   if ((0x8000000080000L & l) != 0L)
-                     { jjCheckNAdd(201); }
+                     jjstateSet[jjnewStateCnt++] = 201;
                   break;
                case 203:
-                  if ((0x80000000800L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 202;
                   break;
-               case 204:
-                  if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 203;
-                  break;
-               case 205:
-                  if ((0x80000000800L & l) != 0L)
-                     { jjCheckNAdd(201); }
-                  break;
                case 206:
-                  if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 205;
+                  if ((0x8000000080000L & l) != 0L)
+                     { jjCheckNAdd(205); }
                   break;
                case 207:
-                  if ((0x800000008000L & l) != 0L && kind > 53)
-                     kind = 53;
+                  if ((0x80000000800L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 206;
                   break;
                case 208:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 207;
                   break;
                case 209:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 208;
+                  if ((0x80000000800L & l) != 0L)
+                     { jjCheckNAdd(205); }
                   break;
                case 210:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 209;
                   break;
                case 211:
-                  if ((0x80000000800L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 210;
+                  if ((0x800000008000L & l) != 0L && kind > 52)
+                     kind = 52;
                   break;
                case 212:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 211;
                   break;
                case 213:
-                  if ((0x20000000200L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 212;
                   break;
                case 214:
-                  if ((0x40000000400000L & l) != 0L)
-                     { jjAddStates(55, 58); }
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 213;
                   break;
                case 215:
-                  if ((0x1000000010000L & l) != 0L && kind > 7)
-                     kind = 7;
+                  if ((0x80000000800L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 214;
                   break;
                case 216:
-               case 227:
-                  if ((0x200000002L & l) != 0L)
-                     { jjCheckNAdd(215); }
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 215;
                   break;
                case 217:
-                  if ((0x80000000800000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 216;
                   break;
                case 218:
-                  if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 217;
+                  if ((0x40000000400000L & l) != 0L)
+                     { jjAddStates(55, 58); }
                   break;
                case 219:
-                  if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 218;
+                  if ((0x1000000010000L & l) != 0L && kind > 7)
+                     kind = 7;
                   break;
                case 220:
-                  if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 219;
+               case 231:
+                  if ((0x200000002L & l) != 0L)
+                     { jjCheckNAdd(219); }
                   break;
                case 221:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x80000000800000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 220;
                   break;
                case 222:
-                  if ((0x200000002000000L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 221;
                   break;
                case 223:
-                  if ((0x4000000040L & l) != 0L)
+                  if ((0x1000000010L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 222;
                   break;
                case 224:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 223;
                   break;
                case 225:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 224;
                   break;
                case 226:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 225;
                   break;
+               case 227:
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 226;
+                  break;
                case 228:
-                  if ((0x80000000800000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 227;
                   break;
                case 229:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 228;
                   break;
                case 230:
-                  if (curChar == 95)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 229;
                   break;
-               case 231:
-                  if ((0x1000000010L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 230;
-                  break;
                case 232:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x80000000800000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 231;
                   break;
                case 233:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 232;
                   break;
                case 234:
@@ -1998,106 +1986,122 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 233;
                   break;
                case 235:
-                  if ((0x200000002000000L & l) != 0L)
+                  if ((0x1000000010L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 234;
                   break;
                case 236:
-                  if ((0x4000000040L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 235;
                   break;
                case 237:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 236;
                   break;
                case 238:
-                  if ((0x4000000040000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 237;
                   break;
                case 239:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 238;
                   break;
                case 240:
-                  if ((0x10000000100000L & l) != 0L && kind > 8)
-                     kind = 8;
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 239;
                   break;
                case 241:
-               case 250:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAdd(240); }
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 240;
                   break;
                case 242:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 241;
                   break;
                case 243:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 242;
                   break;
                case 244:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 243;
+                  if ((0x10000000100000L & l) != 0L && kind > 8)
+                     kind = 8;
                   break;
                case 245:
-                  if ((0x200000002000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 244;
+               case 254:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjCheckNAdd(244); }
                   break;
                case 246:
-                  if ((0x4000000040L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 245;
                   break;
                case 247:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 246;
                   break;
                case 248:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 247;
                   break;
                case 249:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 248;
                   break;
+               case 250:
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 249;
+                  break;
                case 251:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 250;
                   break;
                case 252:
-                  if (curChar == 95)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 251;
                   break;
                case 253:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 252;
                   break;
-               case 254:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 253;
-                  break;
                case 255:
-                  if (curChar == 95)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 254;
                   break;
                case 256:
-                  if ((0x200000002000000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 255;
                   break;
                case 257:
-                  if ((0x4000000040L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 256;
                   break;
                case 258:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 257;
                   break;
                case 259:
-                  if ((0x4000000040000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 258;
                   break;
                case 260:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 259;
                   break;
+               case 261:
+                  if ((0x4000000040L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 260;
+                  break;
+               case 262:
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 261;
+                  break;
+               case 263:
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 262;
+                  break;
+               case 264:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 263;
+                  break;
                default : break;
             }
          } while(i != startsAt);
@@ -2116,105 +2120,105 @@ else if (curChar == 124)
                case 5:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                   {
-                     if (kind > 74)
-                        kind = 74;
+                     if (kind > 73)
+                        kind = 73;
                      { jjCheckNAddTwoStates(20, 21); }
                   }
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(86, 89); }
+                     { jjCheckNAddStates(87, 90); }
                   if (jjCanMove_4(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(90, 93); }
+                     { jjCheckNAddStates(91, 94); }
                   break;
                case 20:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 73)
+                     kind = 73;
                   { jjCheckNAddTwoStates(20, 21); }
                   break;
-               case 80:
+               case 84:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(86, 89); }
+                     { jjCheckNAddStates(87, 90); }
                   break;
-               case 82:
+               case 86:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(22, 24); }
                   break;
-               case 83:
+               case 87:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(22, 24); }
                   break;
-               case 84:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 65)
-                     kind = 65;
+               case 88:
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 64)
+                     kind = 64;
                   break;
-               case 86:
+               case 90:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(25, 27); }
                   break;
-               case 87:
+               case 91:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(25, 27); }
                   break;
-               case 88:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 66)
-                     kind = 66;
-                  break;
-               case 91:
                case 92:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(28, 30); }
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 65)
+                     kind = 65;
                   break;
                case 95:
                case 96:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(31, 33); }
+                     { jjCheckNAddStates(28, 30); }
                   break;
+               case 99:
                case 100:
-               case 101:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(34, 36); }
+                     { jjCheckNAddStates(31, 33); }
                   break;
                case 104:
                case 105:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddStates(34, 36); }
+                  break;
+               case 108:
+               case 109:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(37, 39); }
                   break;
-               case 107:
+               case 111:
                   if (jjCanMove_4(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(90, 93); }
+                     { jjCheckNAddStates(91, 94); }
                   break;
-               case 109:
+               case 113:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(40, 42); }
                   break;
-               case 110:
+               case 114:
                   if (jjCanMove_5(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(40, 42); }
                   break;
-               case 111:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 65)
-                     kind = 65;
+               case 115:
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 64)
+                     kind = 64;
                   break;
-               case 113:
+               case 117:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(43, 45); }
                   break;
-               case 114:
+               case 118:
                   if (jjCanMove_5(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(43, 45); }
                   break;
-               case 115:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 67)
-                     kind = 67;
-                  break;
-               case 118:
                case 119:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(46, 48); }
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 66)
+                     kind = 66;
                   break;
                case 122:
                case 123:
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddStates(46, 48); }
+                  break;
+               case 126:
+               case 127:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(49, 51); }
                   break;
@@ -2229,7 +2233,7 @@ else if (curChar == 124)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 261 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 265 - (jjnewStateCnt = startsAt)))
          break;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { break; }
@@ -2259,11 +2263,11 @@ else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
 public static final String[] jjstrLiteralImages = {
 "", null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, "\173", "\175", "\72", "\50", "\51", "\133", "\135", null, 
-null, null, null, null, null, null, "\74", "\76", null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, "\174", null, null, 
-null, null, "\54", null, null, null, null, null, null, null, null, null, "\12", 
-"\137", "\75", };
+null, null, null, "\173", "\175", "\72", "\50", "\51", "\133", "\135", null, null, 
+null, null, null, null, null, "\74", "\76", null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, "\174", null, null, null, 
+null, "\54", null, null, null, null, null, null, null, null, null, "\12", "\137", 
+"\75", };
 protected Token jjFillToken()
 {
    final Token t;
@@ -2288,12 +2292,12 @@ protected Token jjFillToken()
    return t;
 }
 static final int[] jjnextStates = {
-   142, 143, 134, 20, 21, 127, 128, 131, 117, 119, 121, 123, 90, 92, 94, 96, 
-   126, 127, 128, 129, 131, 132, 81, 83, 84, 85, 87, 88, 90, 92, 93, 94, 
-   96, 97, 99, 101, 102, 103, 105, 106, 108, 110, 111, 112, 114, 115, 117, 119, 
-   120, 121, 123, 124, 135, 136, 139, 226, 239, 249, 260, 182, 49, 199, 200, 204, 
-   206, 213, 152, 70, 157, 164, 168, 174, 73, 75, 48, 49, 69, 71, 35, 36, 
-   23, 29, 99, 101, 103, 105, 81, 83, 85, 87, 108, 110, 112, 114, 
+   146, 147, 138, 20, 21, 131, 132, 135, 121, 123, 125, 127, 94, 96, 98, 100, 
+   130, 131, 132, 133, 135, 136, 85, 87, 88, 89, 91, 92, 94, 96, 97, 98, 
+   100, 101, 103, 105, 106, 107, 109, 110, 112, 114, 115, 116, 118, 119, 121, 123, 
+   124, 125, 127, 128, 139, 140, 143, 230, 243, 253, 264, 186, 49, 203, 204, 208, 
+   210, 217, 156, 70, 161, 168, 172, 178, 75, 79, 81, 48, 49, 69, 71, 35, 
+   36, 23, 29, 103, 105, 107, 109, 85, 87, 89, 91, 112, 114, 116, 118, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -2529,7 +2533,7 @@ private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 261; i-- > 0;)
+    for (i = 265; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
@@ -2561,10 +2565,10 @@ public void SwitchTo(int lexState)
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfbe07ffffffffff9L, 0x387ffL, 
+   0xfdf03ffffffffff9L, 0x1c3ffL, 
 };
 static final long[] jjtoSkip = {
    0x6L, 0x0L, 
@@ -2577,8 +2581,8 @@ public void SwitchTo(int lexState)
 };
     protected SimpleCharStream  input_stream;
 
-    private final int[] jjrounds = new int[261];
-    private final int[] jjstateSet = new int[2 * 261];
+    private final int[] jjrounds = new int[265];
+    private final int[] jjstateSet = new int[2 * 265];
     private final StringBuilder jjimage = new StringBuilder();
     private StringBuilder image = jjimage;
     private int jjimageLen;
diff --git a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
index faacbcb7..615e6916 100644
--- a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
+++ b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
@@ -31,6 +31,7 @@
 import com.cinchapi.ccl.grammar.KeySymbol;
 import com.cinchapi.ccl.grammar.Symbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
+import com.cinchapi.ccl.grammar.command.*;
 import com.cinchapi.ccl.syntax.*;
 import com.cinchapi.ccl.type.Operator;
 import com.cinchapi.ccl.type.function.IndexFunction;
@@ -2251,6 +2252,307 @@ public void testIndexFunctionWithTimestampAbstractSyntaxTree() {
                         TimeUnit.MICROSECONDS));
     }
 
+    @Test
+    public void testAddCommand() {
+        String ccl = "add name as \"John Doe\" in 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        AddSymbol command = (AddSymbol) rootNode.root();
+
+        Assert.assertEquals("ADD", command.type());
+        Assert.assertEquals("name", command.key().toString());
+        Assert.assertEquals("\"John Doe\"", command.value().toString());
+        Assert.assertEquals(1L, command.record());
+    }
+
+    @Test
+    public void testSetCommand() {
+        String ccl = "set age as 25 in 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        SetSymbol command = (SetSymbol) rootNode.root();
+
+        Assert.assertEquals("SET", command.type());
+        Assert.assertEquals("age", command.key().toString());
+        Assert.assertEquals("25", command.value().toString());
+        Assert.assertEquals(1L, command.record());
+    }
+
+    @Test
+    public void testRemoveCommand() {
+        String ccl = "remove name from 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        RemoveSymbol command = (RemoveSymbol) rootNode.root();
+
+        Assert.assertEquals("REMOVE", command.type());
+        Assert.assertEquals("name", command.key().toString());
+        Assert.assertNull(command.value());
+        Assert.assertEquals(1L, command.record());
+    }
+
+    @Test
+    public void testRemoveValueCommand() {
+        String ccl = "remove name as \"John Doe\" from 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        RemoveSymbol command = (RemoveSymbol) rootNode.root();
+
+        Assert.assertEquals("REMOVE", command.type());
+        Assert.assertEquals("name", command.key().toString());
+        Assert.assertEquals("\"John Doe\"", command.value().toString());
+        Assert.assertEquals(1L, command.record());
+    }
+
+    @Test
+    public void testClearCommand() {
+        String ccl = "clear name from 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        ClearSymbol command = (ClearSymbol) rootNode.root();
+
+        Assert.assertEquals("CLEAR", command.type());
+        Assert.assertEquals("name", command.key().toString());
+        Assert.assertEquals(1L, command.record());
+    }
+
+    @Test
+    public void testClearMultipleKeysCommand() {
+        String ccl = "clear [name, age] from 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        ClearSymbol command = (ClearSymbol) rootNode.root();
+
+        Assert.assertEquals("CLEAR", command.type());
+        Assert.assertNull(command.key());
+        Assert.assertEquals(2, command.keys().size());
+        Assert.assertEquals(1L, command.record());
+    }
+
+    @Test
+    public void testVerifyAndSwapCommand() {
+        String ccl = "verifyAndSwap name as John in 1 with Jane";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        VerifyAndSwapSymbol command = (VerifyAndSwapSymbol) rootNode.root();
+
+        Assert.assertEquals("VERIFY_AND_SWAP", command.type());
+        Assert.assertEquals("name", command.key().toString());
+        Assert.assertEquals("John", command.expected().toString());
+        Assert.assertEquals("Jane", command.replacement().toString());
+        Assert.assertEquals(1L, command.record());
+    }
+
+    @Test
+    public void testVerifyOrSetCommand() {
+        String ccl = "verifyOrSet name as John in 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        VerifyOrSetSymbol command = (VerifyOrSetSymbol) rootNode.root();
+
+        Assert.assertEquals("VERIFY_OR_SET", command.type());
+        Assert.assertEquals("name", command.key().toString());
+        Assert.assertEquals("John", command.value().toString());
+        Assert.assertEquals(1L, command.record());
+    }
+
+    @Test
+    public void testInsertCommand() {
+        String ccl = "insert \"{'name':'John'}\" in 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        InsertSymbol command = (InsertSymbol) rootNode.root();
+
+        Assert.assertEquals("INSERT", command.type());
+        Assert.assertEquals("\"{'name':'John'}\"", command.json());
+        Assert.assertEquals(1L, (long)command.record());
+    }
+
+    @Test
+    public void testLinkCommand() {
+        String ccl = "link friends from 1 to 2";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        LinkSymbol command = (LinkSymbol) rootNode.root();
+
+        Assert.assertEquals("LINK", command.type());
+        Assert.assertEquals("friends", command.key().toString());
+        Assert.assertEquals(1L, command.source());
+        Assert.assertEquals(1, command.destinations().size());
+        Assert.assertTrue(command.destinations().contains(2L));
+    }
+
+    @Test
+    public void testUnlinkCommand() {
+        String ccl = "unlink friends from 1 to [2,3]";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        UnlinkSymbol command = (UnlinkSymbol) rootNode.root();
+
+        Assert.assertEquals("UNLINK", command.type());
+        Assert.assertEquals("friends", command.key().toString());
+        Assert.assertEquals(1L, command.source());
+        Assert.assertEquals(2, command.destinations().size());
+        Assert.assertTrue(command.destinations().contains(2L));
+        Assert.assertTrue(command.destinations().contains(3L));
+    }
+
+    @Test
+    public void testSelectCommand() {
+        String ccl = "select age from 1";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        SelectSymbol command = (SelectSymbol) rootNode.root();
+
+        Assert.assertEquals("SELECT", command.type());
+        Assert.assertEquals("age", command.key().toString());
+        Assert.assertEquals(1L, command.record());
+        Assert.assertNull(command.timestamp());
+    }
+
+    @Test
+    public void testSelectCommandWithTimestamp() {
+        String ccl = "select age from 1 as of \"yesterday\"";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        SelectSymbol command = (SelectSymbol) rootNode.root();
+
+        Assert.assertEquals("SELECT", command.type());
+        Assert.assertEquals("age", command.key().toString());
+        Assert.assertEquals(1L, command.record());
+        Assert.assertNotNull(command.timestamp());
+    }
+
+    @Test
+    public void testRevertCommand() {
+        String ccl = "revert name in 1 as of yesterday";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        RevertSymbol command = (RevertSymbol) rootNode.root();
+
+        Assert.assertEquals("REVERT", command.type());
+        Assert.assertEquals("name", command.key().toString());
+        Assert.assertEquals(1L, command.record());
+        Assert.assertNotNull(command.timestamp());
+    }
+
+    @Test
+    public void testSearchCommand() {
+        String ccl = "search name for \"John\"";
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree tree = compiler.parse(ccl);
+
+        // Root node
+        Assert.assertTrue(tree instanceof CommandTree);
+        CommandTree rootNode = (CommandTree) tree;
+        SearchSymbol command = (SearchSymbol) rootNode.root();
+
+        Assert.assertEquals("SEARCH", command.type());
+        Assert.assertEquals("name", command.key().toString());
+        Assert.assertEquals("\"John\"", command.query());
+    }
+
     @Test
     public void testReproIX5A() {
         Criteria criteria = Criteria.where()
diff --git a/src/test/java/com/cinchapi/ccl/GrammarTest.java b/src/test/java/com/cinchapi/ccl/GrammarTest.java
index fd2620d7..1c885e53 100644
--- a/src/test/java/com/cinchapi/ccl/GrammarTest.java
+++ b/src/test/java/com/cinchapi/ccl/GrammarTest.java
@@ -15,31 +15,14 @@
  */
 package com.cinchapi.ccl;
 
-import com.cinchapi.ccl.generated.ASTFunction;
-import com.cinchapi.ccl.generated.ASTOrder;
-import com.cinchapi.ccl.generated.ASTPage;
-import com.cinchapi.ccl.generated.Grammar;
-import com.cinchapi.ccl.generated.GrammarVisitor;
-import com.cinchapi.ccl.syntax.AndTree;
-import com.cinchapi.ccl.syntax.ConditionTree;
-import com.cinchapi.ccl.syntax.ExpressionTree;
-import com.cinchapi.ccl.syntax.FunctionTree;
-import com.cinchapi.ccl.syntax.OrTree;
-import com.cinchapi.ccl.syntax.OrderTree;
-import com.cinchapi.ccl.syntax.PageTree;
+import com.cinchapi.ccl.generated.*;
+import com.cinchapi.ccl.syntax.*;
 import com.cinchapi.ccl.type.Operator;
-import com.cinchapi.ccl.generated.ASTAnd;
-import com.cinchapi.ccl.generated.ASTExpression;
-import com.cinchapi.ccl.generated.ASTOr;
-import com.cinchapi.ccl.generated.ASTStart;
-import com.cinchapi.ccl.generated.SimpleNode;
 import com.cinchapi.concourse.util.Convert;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import org.junit.Test;
 
-import com.cinchapi.ccl.generated.ParseException;
-
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
@@ -694,6 +677,222 @@ public void testIndexFunctionWithTimestamp() throws UnsupportedEncodingException
         grammar.generateAST();
     }
 
+    @Test
+    public void testAddCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "add name as \"John Doe\" in 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testSetCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "set age as 25 in 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testRemoveCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "remove name from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testClearCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "clear [name, age] from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testInsertCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert \"{'name':'John'}\" into 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testVerifyAndSwapCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "verifyAndSwap name as \"John\" in 1 with \"Jane\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testVerifyOrSetCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "verifyOrSet name as \"John\" in 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testLinkCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "link friends from 1 to [2,3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testUnlinkCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "unlink friends from 1 to [2,3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testSelectCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "select age from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testSelectCommandWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "select age from 1 as of \"yesterday\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFetchCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "fetch [name, age] from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testGetCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get age from [1,2,3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDescribeCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "describe 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDescribeCommandWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "describe 1 as of \"yesterday\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testAuditCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "audit name from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testSearchCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "search name for \"John\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testStageCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "stage";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testCommitCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "commit";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testAbortCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "abort";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testRevertCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "revert name in 1 as of yesterday";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidAddCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "add name in 1"; // Missing "as" keyword
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidInsertCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert into 1"; // Missing JSON data
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidLinkCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "link friends from 1"; // Missing destination
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
     /**
      * Constants
      */
@@ -760,6 +959,11 @@ public Object visit(ASTPage node, Object data) {
         public Object visit(ASTFunction node, Object data) {
             return new FunctionTree(node.function());
         }
+
+        @Override
+        public Object visit(ASTCommand node, Object data) {
+            return new CommandTree(node.command(), null, null, null);
+        }
     };
 
 }

From a81d3b48c626601a099b44c6cfebfc9f50c2dcb8 Mon Sep 17 00:00:00 2001
From: Javier Lores <lores.javier@gmail.com>
Date: Thu, 30 Jan 2025 10:14:16 -0500
Subject: [PATCH 5/9] updated grammar to handle order by failed testing case
 and in failing test cases

---
 grammar/grammar.jjt                           |    6 +-
 .../com/cinchapi/ccl/generated/Grammar.java   | 4000 +++++++++--------
 .../ccl/generated/GrammarTokenManager.java    |  857 ++--
 .../java/com/cinchapi/ccl/GrammarTest.java    |   62 +-
 4 files changed, 2722 insertions(+), 2203 deletions(-)

diff --git a/grammar/grammar.jjt b/grammar/grammar.jjt
index f20b3880..8b63e2a4 100644
--- a/grammar/grammar.jjt
+++ b/grammar/grammar.jjt
@@ -19,6 +19,7 @@ options {
     VISITOR=true;
     NODE_DEFAULT_VOID=true;
     STATIC=false;
+    DEBUG_LOOKAHEAD=true;
 }
 
 PARSER_BEGIN(Grammar)
@@ -162,7 +163,7 @@ TOKEN : { < OPEN_PARENTHESES : "(" > }
 TOKEN : { < CLOSE_PARENTHESES : ")" > }
 TOKEN : { < OPEN_BRACKET : "[" > }
 TOKEN : { < CLOSE_BRACKET : "]" > }
-TOKEN [IGNORE_CASE]: { < TIMESTAMP: "at" | "on" | "during" | "in" | "as of" > }
+TOKEN [IGNORE_CASE]: {< TIMESTAMP: "at" | "on" | "during" | "as of" > }
 TOKEN [IGNORE_CASE]: { < WHERE: "where" > }
 TOKEN [IGNORE_CASE]: { < RESERVED_IDENTIFIER: "$id$" > }
 
@@ -533,7 +534,7 @@ TimestampSymbol Timestamp() :
   String timestamp = "";
 }
 {
-  <TIMESTAMP> (LOOKAHEAD(2) (word=<QUOTED_STRING> | word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC>) { timestamp += (timestamp.equals("")) ? word.image : " " + word.image; })+
+  (<TIMESTAMP> | <IN>) (LOOKAHEAD(2) (word=<QUOTED_STRING> | word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC>) { timestamp += (timestamp.equals("")) ? word.image : " " + word.image; })+
   { return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp)); }
 }
 
@@ -594,6 +595,7 @@ OrderComponentSymbol OrderClause() :
     DirectionSymbol direction = null;
 }
 {
+
   ((
     direction=SymbolicDirection() key=Key()
   |
diff --git a/src/main/java/com/cinchapi/ccl/generated/Grammar.java b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
index 2cae2f03..bb096bef 100644
--- a/src/main/java/com/cinchapi/ccl/generated/Grammar.java
+++ b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
@@ -78,77 +78,80 @@ public Object transformValue(String token) {
         return valueTransformFunction.apply(token);
     }
 
-  final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree) Start */
+  final public ASTStart StartCommandLine() throws ParseException {
+    trace_call("StartCommandLine");
+    try {
+/*@bgen(jjtree) Start */
   ASTStart jjtn000 = new ASTStart(JJTSTART);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-    try {
-      if (jj_2_1(4)) {
-        Command();
-        jj_consume_token(78);
-      } else if (jj_2_2(3)) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case WHERE:{
-          jj_consume_token(WHERE);
-          break;
-          }
-        default:
-          jj_la1[0] = jj_gen;
-          ;
-        }
-        DisjunctionExpression();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ORDER:{
-          Order();
-          break;
-          }
-        default:
-          jj_la1[1] = jj_gen;
-          ;
-        }
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PAGE:
-        case SIZE:{
-          Page();
-          break;
-          }
-        default:
-          jj_la1[2] = jj_gen;
-          ;
-        }
-        jj_consume_token(78);
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PAGE:
-        case SIZE:{
-          Page();
+      try {
+        if (jj_2_1(4)) {
+          Command();
           jj_consume_token(78);
-          break;
+        } else if (jj_2_2(3)) {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case WHERE:{
+            jj_consume_token(WHERE);
+            break;
+            }
+          default:
+            jj_la1[0] = jj_gen;
+            ;
           }
-        case ORDER:{
-          Order();
-          jj_consume_token(78);
-          break;
+          DisjunctionExpression();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case ORDER:{
+            Order();
+            break;
+            }
+          default:
+            jj_la1[1] = jj_gen;
+            ;
+          }
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case PAGE:
+          case SIZE:{
+            Page();
+            break;
+            }
+          default:
+            jj_la1[2] = jj_gen;
+            ;
           }
-        case NUMERIC:
-        case SIGNED_INTEGER:
-        case SIGNED_DECIMAL:
-        case ALPHANUMERIC:
-        case PERIOD_SEPARATED_STRING:{
-          Function();
           jj_consume_token(78);
-          break;
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case PAGE:
+          case SIZE:{
+            Page();
+            jj_consume_token(78);
+            break;
+            }
+          case ORDER:{
+            Order();
+            jj_consume_token(78);
+            break;
+            }
+          case NUMERIC:
+          case SIGNED_INTEGER:
+          case SIGNED_DECIMAL:
+          case ALPHANUMERIC:
+          case PERIOD_SEPARATED_STRING:{
+            Function();
+            jj_consume_token(78);
+            break;
+            }
+          default:
+            jj_la1[3] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[3] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
         }
-      }
 jjtree.closeNodeScope(jjtn000, true);
      jjtc000 = false;
 {if ("" != null) return jjtn000;}
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
        jjtree.clearNodeScope(jjtn000);
        jjtc000 = false;
@@ -162,85 +165,91 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
        {if (true) throw (ParseException)jjte000;}
      }
      {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
      }
-    }
+      }
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("StartCommandLine");
+    }
 }
 
-  final public ASTStart generateAST() throws ParseException {/*@bgen(jjtree) Start */
+  final public ASTStart generateAST() throws ParseException {
+    trace_call("generateAST");
+    try {
+/*@bgen(jjtree) Start */
   ASTStart jjtn000 = new ASTStart(JJTSTART);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-    try {
-      if (jj_2_3(4)) {
-        Command();
-        jj_consume_token(0);
-      } else if (jj_2_4(3)) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case WHERE:{
-          jj_consume_token(WHERE);
-          break;
-          }
-        default:
-          jj_la1[4] = jj_gen;
-          ;
-        }
-        DisjunctionExpression();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ORDER:{
-          Order();
-          break;
-          }
-        default:
-          jj_la1[5] = jj_gen;
-          ;
-        }
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PAGE:
-        case SIZE:{
-          Page();
-          break;
-          }
-        default:
-          jj_la1[6] = jj_gen;
-          ;
-        }
-        jj_consume_token(0);
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PAGE:
-        case SIZE:{
-          Page();
+      try {
+        if (jj_2_3(4)) {
+          Command();
           jj_consume_token(0);
-          break;
+        } else if (jj_2_4(3)) {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case WHERE:{
+            jj_consume_token(WHERE);
+            break;
+            }
+          default:
+            jj_la1[4] = jj_gen;
+            ;
           }
-        case ORDER:{
-          Order();
-          jj_consume_token(0);
-          break;
+          DisjunctionExpression();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case ORDER:{
+            Order();
+            break;
+            }
+          default:
+            jj_la1[5] = jj_gen;
+            ;
+          }
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case PAGE:
+          case SIZE:{
+            Page();
+            break;
+            }
+          default:
+            jj_la1[6] = jj_gen;
+            ;
           }
-        case NUMERIC:
-        case SIGNED_INTEGER:
-        case SIGNED_DECIMAL:
-        case ALPHANUMERIC:
-        case PERIOD_SEPARATED_STRING:{
-          Function();
           jj_consume_token(0);
-          break;
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case PAGE:
+          case SIZE:{
+            Page();
+            jj_consume_token(0);
+            break;
+            }
+          case ORDER:{
+            Order();
+            jj_consume_token(0);
+            break;
+            }
+          case NUMERIC:
+          case SIGNED_INTEGER:
+          case SIGNED_DECIMAL:
+          case ALPHANUMERIC:
+          case PERIOD_SEPARATED_STRING:{
+            Function();
+            jj_consume_token(0);
+            break;
+            }
+          default:
+            jj_la1[7] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[7] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
         }
-      }
 jjtree.closeNodeScope(jjtn000, true);
      jjtc000 = false;
 {if ("" != null) return jjtn000;}
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
        jjtree.clearNodeScope(jjtn000);
        jjtc000 = false;
@@ -254,24 +263,30 @@ final public ASTStart generateAST() throws ParseException {/*@bgen(jjtree) Start
        {if (true) throw (ParseException)jjte000;}
      }
      {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
      }
-    }
+      }
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("generateAST");
+    }
 }
 
-  final public ASTStart generateSubAST() throws ParseException {/*@bgen(jjtree) Start */
+  final public ASTStart generateSubAST() throws ParseException {
+    trace_call("generateSubAST");
+    try {
+/*@bgen(jjtree) Start */
   ASTStart jjtn000 = new ASTStart(JJTSTART);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-    try {
-      DisjunctionExpression();
+      try {
+        DisjunctionExpression();
 jjtree.closeNodeScope(jjtn000, true);
      jjtc000 = false;
 {if ("" != null) return jjtn000;}
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
        jjtree.clearNodeScope(jjtn000);
        jjtc000 = false;
@@ -285,34 +300,40 @@ final public ASTStart generateSubAST() throws ParseException {/*@bgen(jjtree) St
        {if (true) throw (ParseException)jjte000;}
      }
      {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
      }
-    }
+      }
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("generateSubAST");
+    }
 }
 
   final public void DisjunctionExpression() throws ParseException {
-    ConjunctionExpression();
-    label_1:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case DISJUNCTION:{
-        ;
-        break;
+    trace_call("DisjunctionExpression");
+    try {
+
+      ConjunctionExpression();
+      label_1:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case DISJUNCTION:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[8] = jj_gen;
+          break label_1;
         }
-      default:
-        jj_la1[8] = jj_gen;
-        break label_1;
-      }
 ASTOr jjtn001 = new ASTOr(JJTOR);
                                boolean jjtc001 = true;
                                jjtree.openNodeScope(jjtn001);
-      try {
-        jj_consume_token(DISJUNCTION);
-        ConjunctionExpression();
-      } catch (Throwable jjte001) {
+        try {
+          jj_consume_token(DISJUNCTION);
+          ConjunctionExpression();
+        } catch (Throwable jjte001) {
 if (jjtc001) {
                                  jjtree.clearNodeScope(jjtn001);
                                  jjtc001 = false;
@@ -326,34 +347,40 @@ final public void DisjunctionExpression() throws ParseException {
                                  {if (true) throw (ParseException)jjte001;}
                                }
                                {if (true) throw (Error)jjte001;}
-      } finally {
+        } finally {
 if (jjtc001) {
                                  jjtree.closeNodeScope(jjtn001,  2);
                                }
+        }
       }
+    } finally {
+      trace_return("DisjunctionExpression");
     }
 }
 
   final public void ConjunctionExpression() throws ParseException {
-    UnaryExpression();
-    label_2:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case CONJUNCTION:{
-        ;
-        break;
+    trace_call("ConjunctionExpression");
+    try {
+
+      UnaryExpression();
+      label_2:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case CONJUNCTION:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[9] = jj_gen;
+          break label_2;
         }
-      default:
-        jj_la1[9] = jj_gen;
-        break label_2;
-      }
 ASTAnd jjtn001 = new ASTAnd(JJTAND);
                          boolean jjtc001 = true;
                          jjtree.openNodeScope(jjtn001);
-      try {
-        jj_consume_token(CONJUNCTION);
-        UnaryExpression();
-      } catch (Throwable jjte001) {
+        try {
+          jj_consume_token(CONJUNCTION);
+          UnaryExpression();
+        } catch (Throwable jjte001) {
 if (jjtc001) {
                            jjtree.clearNodeScope(jjtn001);
                            jjtc001 = false;
@@ -367,39 +394,51 @@ final public void ConjunctionExpression() throws ParseException {
                            {if (true) throw (ParseException)jjte001;}
                          }
                          {if (true) throw (Error)jjte001;}
-      } finally {
+        } finally {
 if (jjtc001) {
                            jjtree.closeNodeScope(jjtn001,  2);
                          }
+        }
       }
+    } finally {
+      trace_return("ConjunctionExpression");
     }
 }
 
   final public void UnaryExpression() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case OPEN_PARENTHESES:{
-      jj_consume_token(OPEN_PARENTHESES);
-      DisjunctionExpression();
-      jj_consume_token(CLOSE_PARENTHESES);
-      break;
-      }
-    case RESERVED_IDENTIFIER:
-    case NUMERIC:
-    case SIGNED_INTEGER:
-    case SIGNED_DECIMAL:
-    case ALPHANUMERIC:
-    case PERIOD_SEPARATED_STRING:{
-      RelationalExpression();
-      break;
-      }
-    default:
-      jj_la1[10] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+    trace_call("UnaryExpression");
+    try {
+
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case OPEN_PARENTHESES:{
+        jj_consume_token(OPEN_PARENTHESES);
+        DisjunctionExpression();
+        jj_consume_token(CLOSE_PARENTHESES);
+        break;
+        }
+      case RESERVED_IDENTIFIER:
+      case NUMERIC:
+      case SIGNED_INTEGER:
+      case SIGNED_DECIMAL:
+      case ALPHANUMERIC:
+      case PERIOD_SEPARATED_STRING:{
+        RelationalExpression();
+        break;
+        }
+      default:
+        jj_la1[10] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } finally {
+      trace_return("UnaryExpression");
     }
 }
 
-  final public void RelationalExpression() throws ParseException {/*@bgen(jjtree) Expression */
+  final public void RelationalExpression() throws ParseException {
+    trace_call("RelationalExpression");
+    try {
+/*@bgen(jjtree) Expression */
     ASTExpression jjtn000 = new ASTExpression(JJTEXPRESSION);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
@@ -407,76 +446,80 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
     ValueTokenSymbol value1 = null;
     ValueTokenSymbol value2 = null;
     TimestampSymbol timestamp = null;
-    try {
-      key = Key();
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LINKS_TO:{
-        operator = LinksToOperator();
-        value1 = LinksToValue();
+      try {
+        key = Key();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
+        case LINKS_TO:{
+          operator = LinksToOperator();
+          value1 = LinksToValue();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
+          case TIMESTAMP:{
+            timestamp = Timestamp();
+            break;
+            }
+          default:
+            jj_la1[11] = jj_gen;
+            ;
+          }
           break;
           }
-        default:
-          jj_la1[11] = jj_gen;
-          ;
-        }
-        break;
-        }
-      case REGEX:
-      case NOT_REGEX:
-      case LIKE:
-      case NOT_LIKE:{
-        operator = RegexBasedOperator();
-        value1 = RegexValue();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
+        case REGEX:
+        case NOT_REGEX:
+        case LIKE:
+        case NOT_LIKE:{
+          operator = RegexBasedOperator();
+          value1 = RegexValue();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
+          case TIMESTAMP:{
+            timestamp = Timestamp();
+            break;
+            }
+          default:
+            jj_la1[12] = jj_gen;
+            ;
+          }
           break;
           }
-        default:
-          jj_la1[12] = jj_gen;
-          ;
-        }
-        break;
-        }
-      case UNARY_OPERATOR:
-      case OPEN_ANGLE_BRACKET:
-      case CLOSE_ANGLE_BRACKET:{
-        operator = UnaryOperator();
-        value1 = UnaryValue();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
+        case UNARY_OPERATOR:
+        case OPEN_ANGLE_BRACKET:
+        case CLOSE_ANGLE_BRACKET:{
+          operator = UnaryOperator();
+          value1 = UnaryValue();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
+          case TIMESTAMP:{
+            timestamp = Timestamp();
+            break;
+            }
+          default:
+            jj_la1[13] = jj_gen;
+            ;
+          }
           break;
           }
-        default:
-          jj_la1[13] = jj_gen;
-          ;
-        }
-        break;
-        }
-      case BINARY_OPERATOR:{
-        operator = BinaryOperator();
-        value1 = BinaryValue();
-        value2 = BinaryValue();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
+        case BINARY_OPERATOR:{
+          operator = BinaryOperator();
+          value1 = BinaryValue();
+          value2 = BinaryValue();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
+          case TIMESTAMP:{
+            timestamp = Timestamp();
+            break;
+            }
+          default:
+            jj_la1[14] = jj_gen;
+            ;
+          }
           break;
           }
         default:
-          jj_la1[14] = jj_gen;
-          ;
-        }
-        break;
+          jj_la1[15] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      default:
-        jj_la1[15] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.key(key);
@@ -484,7 +527,7 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
           jjtn000.addValue(value1);
           if(value2 != null) jjtn000.addValue(value2);
           if(timestamp != null) jjtn000.timestamp(timestamp);
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -498,86 +541,265 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("RelationalExpression");
     }
 }
 
-  final public KeyTokenSymbol Key() throws ParseException {FunctionKeySymbol function;
+  final public KeyTokenSymbol Key() throws ParseException {
+    trace_call("Key");
+    try {
+FunctionKeySymbol function;
   Token key;
-    if (jj_2_5(2)) {
-      function = KeyFunction();
+      if (jj_2_5(2)) {
+        function = KeyFunction();
 {if ("" != null) return function;}
-    } else {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case RESERVED_IDENTIFIER:
-      case NUMERIC:
-      case SIGNED_INTEGER:
-      case SIGNED_DECIMAL:
-      case ALPHANUMERIC:{
+      } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case RESERVED_IDENTIFIER:{
-          key = jj_consume_token(RESERVED_IDENTIFIER);
-          break;
-          }
-        case SIGNED_INTEGER:{
-          key = jj_consume_token(SIGNED_INTEGER);
-          break;
-          }
-        case SIGNED_DECIMAL:{
-          key = jj_consume_token(SIGNED_DECIMAL);
-          break;
+        case RESERVED_IDENTIFIER:
+        case NUMERIC:
+        case SIGNED_INTEGER:
+        case SIGNED_DECIMAL:
+        case ALPHANUMERIC:{
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case RESERVED_IDENTIFIER:{
+            key = jj_consume_token(RESERVED_IDENTIFIER);
+            break;
+            }
+          case SIGNED_INTEGER:{
+            key = jj_consume_token(SIGNED_INTEGER);
+            break;
+            }
+          case SIGNED_DECIMAL:{
+            key = jj_consume_token(SIGNED_DECIMAL);
+            break;
+            }
+          case NUMERIC:{
+            key = jj_consume_token(NUMERIC);
+            break;
+            }
+          case ALPHANUMERIC:{
+            key = jj_consume_token(ALPHANUMERIC);
+            break;
+            }
+          default:
+            jj_la1[16] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        case NUMERIC:{
-          key = jj_consume_token(NUMERIC);
+{if ("" != null) return new KeySymbol(key.image);}
           break;
           }
-        case ALPHANUMERIC:{
-          key = jj_consume_token(ALPHANUMERIC);
+        case PERIOD_SEPARATED_STRING:{
+          key = jj_consume_token(PERIOD_SEPARATED_STRING);
+{if ("" != null) return new NavigationKeySymbol(key.image);}
           break;
           }
         default:
-          jj_la1[16] = jj_gen;
+          jj_la1[17] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
-{if ("" != null) return new KeySymbol(key.image);}
-        break;
-        }
-      case PERIOD_SEPARATED_STRING:{
-        key = jj_consume_token(PERIOD_SEPARATED_STRING);
-{if ("" != null) return new NavigationKeySymbol(key.image);}
-        break;
-        }
-      default:
-        jj_la1[17] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
       }
-    }
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("Key");
+    }
 }
 
-  final public ValueTokenSymbol UnaryValue() throws ParseException {FunctionValueSymbol function;
+  final public ValueTokenSymbol UnaryValue() throws ParseException {
+    trace_call("UnaryValue");
+    try {
+FunctionValueSymbol function;
   Token key;
   Token word;
   String value = "";
   List<String> records = Lists.newArrayList();
   ASTStart ccl;
-    if (jj_2_7(2)) {
-      function = ValueFunction();
+      if (jj_2_7(2)) {
+        function = ValueFunction();
 {if ("" != null) return function;}
-    } else {
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case NUMERIC:
+        case SIGNED_INTEGER:
+        case SIGNED_DECIMAL:
+        case ALPHANUMERIC:
+        case PERIOD_SEPARATED_STRING:
+        case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+          label_3:
+          while (true) {
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case SIGNED_INTEGER:{
+              word = jj_consume_token(SIGNED_INTEGER);
+              break;
+              }
+            case SIGNED_DECIMAL:{
+              word = jj_consume_token(SIGNED_DECIMAL);
+              break;
+              }
+            case NUMERIC:{
+              word = jj_consume_token(NUMERIC);
+              break;
+              }
+            case ALPHANUMERIC:{
+              word = jj_consume_token(ALPHANUMERIC);
+              break;
+              }
+            case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+              word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+              break;
+              }
+            case PERIOD_SEPARATED_STRING:{
+              word = jj_consume_token(PERIOD_SEPARATED_STRING);
+              break;
+              }
+            default:
+              jj_la1[18] = jj_gen;
+              jj_consume_token(-1);
+              throw new ParseException();
+            }
+value += (value.equals("")) ? word.image : " " + word.image;
+            if (jj_2_6(2)) {
+              ;
+            } else {
+              break label_3;
+            }
+          }
+if(value.charAt(0) == '$') {
+        String var = value.substring(1);
+        try {
+            value = Iterables.getOnlyElement(data.get(var)).toString();
+        }
+        catch (IllegalArgumentException e) {
+            String err = "Unable to resolve variable {} because multiple values exist locally: {}";
+            {if (true) throw new SyntaxException(AnyStrings.format(err, value, data.get(var)));}
+        }
+        catch (NoSuchElementException e) {
+            String err = "Unable to resolve variable {} because no values exist locally";
+            {if (true) throw new SyntaxException(AnyStrings.format(err, value));}
+        }
+    }
+    else if(value.length() > 2 && value.charAt(0) == '\\'
+            && value.charAt(1) == '$') {
+        value = value.substring(1);
+    }
+    else {
+        value = value.replace("\\@", "@");
+    }
+    {if ("" != null) return new ValueSymbol(transformValue(value));}
+          break;
+          }
+        case QUOTED_STRING:{
+          word = jj_consume_token(QUOTED_STRING);
+{if ("" != null) return new ValueSymbol(transformValue(word.image.replace("\\\"", "\"")));}
+          break;
+          }
+        default:
+          jj_la1[19] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+      }
+    throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("UnaryValue");
+    }
+}
+
+  final public ValueTokenSymbol LinksToValue() throws ParseException {
+    trace_call("LinksToValue");
+    try {
+Token word;
+      word = jj_consume_token(NUMERIC);
+{if ("" != null) return new ValueSymbol(transformValue(word.image));}
+    throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("LinksToValue");
+    }
+}
+
+  final public ValueTokenSymbol RegexValue() throws ParseException {
+    trace_call("RegexValue");
+    try {
+Token word;
+  String value = "";
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case OPEN_PARENTHESES:{
+        jj_consume_token(OPEN_PARENTHESES);
+        label_4:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case SIGNED_INTEGER:{
+            word = jj_consume_token(SIGNED_INTEGER);
+            break;
+            }
+          case SIGNED_DECIMAL:{
+            word = jj_consume_token(SIGNED_DECIMAL);
+            break;
+            }
+          case NUMERIC:{
+            word = jj_consume_token(NUMERIC);
+            break;
+            }
+          case ALPHANUMERIC:{
+            word = jj_consume_token(ALPHANUMERIC);
+            break;
+            }
+          case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+            word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+            break;
+            }
+          case PERIOD_SEPARATED_STRING:{
+            word = jj_consume_token(PERIOD_SEPARATED_STRING);
+            break;
+            }
+          case 79:{
+            word = jj_consume_token(79);
+            break;
+            }
+          case 80:{
+            word = jj_consume_token(80);
+            break;
+            }
+          default:
+            jj_la1[20] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+if (value.equals("") |
+            value.endsWith("(") | word.image.equals(")") |
+            value.endsWith("=") | word.image.equals("=") |
+            value.endsWith("_") | word.image.equals("_")) {
+            value += word.image;
+        }
+        else {
+            value += " " + word.image;
+        }
+          if (jj_2_8(4)) {
+            ;
+          } else {
+            break label_4;
+          }
+        }
+        jj_consume_token(CLOSE_PARENTHESES);
+{if ("" != null) return new ValueSymbol(transformValue("(" + value + ")"));}
+        break;
+        }
       case NUMERIC:
       case SIGNED_INTEGER:
       case SIGNED_DECIMAL:
       case ALPHANUMERIC:
       case PERIOD_SEPARATED_STRING:
-      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-        label_3:
+      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:
+      case 79:
+      case 80:{
+        label_5:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case SIGNED_INTEGER:{
@@ -604,40 +826,35 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
             word = jj_consume_token(PERIOD_SEPARATED_STRING);
             break;
             }
+          case 79:{
+            word = jj_consume_token(79);
+            break;
+            }
+          case 80:{
+            word = jj_consume_token(80);
+            break;
+            }
           default:
-            jj_la1[18] = jj_gen;
+            jj_la1[21] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
-value += (value.equals("")) ? word.image : " " + word.image;
-          if (jj_2_6(2)) {
+if (value.equals("") |
+            value.endsWith("(") | word.image.equals(")") |
+            value.endsWith("=") | word.image.equals("=") |
+            value.endsWith("_") | word.image.equals("_")) {
+            value += word.image;
+        }
+        else {
+            value += " " + word.image;
+        }
+          if (jj_2_9(3)) {
             ;
           } else {
-            break label_3;
+            break label_5;
           }
         }
-if(value.charAt(0) == '$') {
-        String var = value.substring(1);
-        try {
-            value = Iterables.getOnlyElement(data.get(var)).toString();
-        }
-        catch (IllegalArgumentException e) {
-            String err = "Unable to resolve variable {} because multiple values exist locally: {}";
-            {if (true) throw new SyntaxException(AnyStrings.format(err, value, data.get(var)));}
-        }
-        catch (NoSuchElementException e) {
-            String err = "Unable to resolve variable {} because no values exist locally";
-            {if (true) throw new SyntaxException(AnyStrings.format(err, value));}
-        }
-    }
-    else if(value.length() > 2 && value.charAt(0) == '\\'
-            && value.charAt(1) == '$') {
-        value = value.substring(1);
-    }
-    else {
-        value = value.replace("\\@", "@");
-    }
-    {if ("" != null) return new ValueSymbol(transformValue(value));}
+{if ("" != null) return new ValueSymbol(transformValue(value));}
         break;
         }
       case QUOTED_STRING:{
@@ -646,210 +863,66 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         break;
         }
       default:
-        jj_la1[19] = jj_gen;
+        jj_la1[22] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-    }
-    throw new Error("Missing return statement in function");
-}
-
-  final public ValueTokenSymbol LinksToValue() throws ParseException {Token word;
-    word = jj_consume_token(NUMERIC);
-{if ("" != null) return new ValueSymbol(transformValue(word.image));}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("RegexValue");
+    }
 }
 
-  final public ValueTokenSymbol RegexValue() throws ParseException {Token word;
-  String value = "";
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case OPEN_PARENTHESES:{
-      jj_consume_token(OPEN_PARENTHESES);
-      label_4:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case SIGNED_INTEGER:{
-          word = jj_consume_token(SIGNED_INTEGER);
-          break;
-          }
-        case SIGNED_DECIMAL:{
-          word = jj_consume_token(SIGNED_DECIMAL);
-          break;
-          }
-        case NUMERIC:{
-          word = jj_consume_token(NUMERIC);
-          break;
-          }
-        case ALPHANUMERIC:{
-          word = jj_consume_token(ALPHANUMERIC);
-          break;
-          }
-        case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-          word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
-          break;
-          }
-        case PERIOD_SEPARATED_STRING:{
-          word = jj_consume_token(PERIOD_SEPARATED_STRING);
-          break;
-          }
-        case 79:{
-          word = jj_consume_token(79);
-          break;
-          }
-        case 80:{
-          word = jj_consume_token(80);
-          break;
-          }
-        default:
-          jj_la1[20] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-if (value.equals("") |
-            value.endsWith("(") | word.image.equals(")") |
-            value.endsWith("=") | word.image.equals("=") |
-            value.endsWith("_") | word.image.equals("_")) {
-            value += word.image;
-        }
-        else {
-            value += " " + word.image;
-        }
-        if (jj_2_8(4)) {
-          ;
-        } else {
-          break label_4;
-        }
-      }
-      jj_consume_token(CLOSE_PARENTHESES);
-{if ("" != null) return new ValueSymbol(transformValue("(" + value + ")"));}
-      break;
-      }
-    case NUMERIC:
-    case SIGNED_INTEGER:
-    case SIGNED_DECIMAL:
-    case ALPHANUMERIC:
-    case PERIOD_SEPARATED_STRING:
-    case NON_ALPHANUMERIC_AND_ALPHANUMERIC:
-    case 79:
-    case 80:{
-      label_5:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case SIGNED_INTEGER:{
-          word = jj_consume_token(SIGNED_INTEGER);
-          break;
-          }
-        case SIGNED_DECIMAL:{
-          word = jj_consume_token(SIGNED_DECIMAL);
-          break;
-          }
-        case NUMERIC:{
-          word = jj_consume_token(NUMERIC);
-          break;
-          }
-        case ALPHANUMERIC:{
-          word = jj_consume_token(ALPHANUMERIC);
-          break;
-          }
-        case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-          word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
-          break;
-          }
-        case PERIOD_SEPARATED_STRING:{
-          word = jj_consume_token(PERIOD_SEPARATED_STRING);
-          break;
-          }
-        case 79:{
-          word = jj_consume_token(79);
-          break;
-          }
-        case 80:{
-          word = jj_consume_token(80);
-          break;
-          }
-        default:
-          jj_la1[21] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-if (value.equals("") |
-            value.endsWith("(") | word.image.equals(")") |
-            value.endsWith("=") | word.image.equals("=") |
-            value.endsWith("_") | word.image.equals("_")) {
-            value += word.image;
-        }
-        else {
-            value += " " + word.image;
-        }
-        if (jj_2_9(3)) {
-          ;
-        } else {
-          break label_5;
-        }
-      }
-{if ("" != null) return new ValueSymbol(transformValue(value));}
-      break;
-      }
-    case QUOTED_STRING:{
-      word = jj_consume_token(QUOTED_STRING);
-{if ("" != null) return new ValueSymbol(transformValue(word.image.replace("\\\"", "\"")));}
-      break;
-      }
-    default:
-      jj_la1[22] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-    throw new Error("Missing return statement in function");
-}
-
-  final public ValueTokenSymbol BinaryValue() throws ParseException {FunctionValueSymbol function;
+  final public ValueTokenSymbol BinaryValue() throws ParseException {
+    trace_call("BinaryValue");
+    try {
+FunctionValueSymbol function;
   Token key;
   Token word;
   String value = "";
   List<String> records = Lists.newArrayList();
   ASTStart ccl;
-    if (jj_2_10(2)) {
-      function = ValueFunction();
+      if (jj_2_10(2)) {
+        function = ValueFunction();
 {if ("" != null) return function;}
-    } else {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NUMERIC:
-      case SIGNED_INTEGER:
-      case SIGNED_DECIMAL:
-      case ALPHANUMERIC:
-      case PERIOD_SEPARATED_STRING:
-      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+      } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case SIGNED_INTEGER:{
-          word = jj_consume_token(SIGNED_INTEGER);
-          break;
-          }
-        case SIGNED_DECIMAL:{
-          word = jj_consume_token(SIGNED_DECIMAL);
-          break;
-          }
-        case NUMERIC:{
-          word = jj_consume_token(NUMERIC);
-          break;
-          }
-        case ALPHANUMERIC:{
-          word = jj_consume_token(ALPHANUMERIC);
-          break;
-          }
+        case NUMERIC:
+        case SIGNED_INTEGER:
+        case SIGNED_DECIMAL:
+        case ALPHANUMERIC:
+        case PERIOD_SEPARATED_STRING:
         case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-          word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
-          break;
-          }
-        case PERIOD_SEPARATED_STRING:{
-          word = jj_consume_token(PERIOD_SEPARATED_STRING);
-          break;
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case SIGNED_INTEGER:{
+            word = jj_consume_token(SIGNED_INTEGER);
+            break;
+            }
+          case SIGNED_DECIMAL:{
+            word = jj_consume_token(SIGNED_DECIMAL);
+            break;
+            }
+          case NUMERIC:{
+            word = jj_consume_token(NUMERIC);
+            break;
+            }
+          case ALPHANUMERIC:{
+            word = jj_consume_token(ALPHANUMERIC);
+            break;
+            }
+          case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+            word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+            break;
+            }
+          case PERIOD_SEPARATED_STRING:{
+            word = jj_consume_token(PERIOD_SEPARATED_STRING);
+            break;
+            }
+          default:
+            jj_la1[23] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[23] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
 value = word.image;
     if(value.charAt(0) == '$') {
         String var = value.substring(1);
@@ -873,112 +946,123 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         value = value.replace("\\@", "@");
     }
     {if ("" != null) return new ValueSymbol(transformValue(value));}
-        break;
-        }
-      case QUOTED_STRING:{
-        word = jj_consume_token(QUOTED_STRING);
+          break;
+          }
+        case QUOTED_STRING:{
+          word = jj_consume_token(QUOTED_STRING);
 {if ("" != null) return new ValueSymbol(transformValue(word.image.replace("\\\"", "\"")));}
-        break;
+          break;
+          }
+        default:
+          jj_la1[24] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      default:
-        jj_la1[24] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
       }
-    }
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("BinaryValue");
+    }
 }
 
-  final public OperatorSymbol LinksToOperator() throws ParseException {Token operator;
-    operator = jj_consume_token(LINKS_TO);
+  final public OperatorSymbol LinksToOperator() throws ParseException {
+    trace_call("LinksToOperator");
+    try {
+Token operator;
+      operator = jj_consume_token(LINKS_TO);
 {if ("" != null) return new OperatorSymbol(transformOperator(operator.image));}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("LinksToOperator");
+    }
 }
 
-  final public OperatorSymbol RegexBasedOperator() throws ParseException {Token operator;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case REGEX:{
-      operator = jj_consume_token(REGEX);
-      break;
-      }
-    case NOT_REGEX:{
-      operator = jj_consume_token(NOT_REGEX);
-      break;
-      }
-    case LIKE:{
-      operator = jj_consume_token(LIKE);
-      break;
-      }
-    case NOT_LIKE:{
-      operator = jj_consume_token(NOT_LIKE);
-      break;
+  final public OperatorSymbol RegexBasedOperator() throws ParseException {
+    trace_call("RegexBasedOperator");
+    try {
+Token operator;
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case REGEX:{
+        operator = jj_consume_token(REGEX);
+        break;
+        }
+      case NOT_REGEX:{
+        operator = jj_consume_token(NOT_REGEX);
+        break;
+        }
+      case LIKE:{
+        operator = jj_consume_token(LIKE);
+        break;
+        }
+      case NOT_LIKE:{
+        operator = jj_consume_token(NOT_LIKE);
+        break;
+        }
+      default:
+        jj_la1[25] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[25] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
 {if ("" != null) return new OperatorSymbol(transformOperator(operator.image));}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("RegexBasedOperator");
+    }
 }
 
-  final public OperatorSymbol UnaryOperator() throws ParseException {Token operator;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case UNARY_OPERATOR:{
-      operator = jj_consume_token(UNARY_OPERATOR);
-      break;
-      }
-    case OPEN_ANGLE_BRACKET:{
-      operator = jj_consume_token(OPEN_ANGLE_BRACKET);
-      break;
-      }
-    case CLOSE_ANGLE_BRACKET:{
-      operator = jj_consume_token(CLOSE_ANGLE_BRACKET);
-      break;
+  final public OperatorSymbol UnaryOperator() throws ParseException {
+    trace_call("UnaryOperator");
+    try {
+Token operator;
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case UNARY_OPERATOR:{
+        operator = jj_consume_token(UNARY_OPERATOR);
+        break;
+        }
+      case OPEN_ANGLE_BRACKET:{
+        operator = jj_consume_token(OPEN_ANGLE_BRACKET);
+        break;
+        }
+      case CLOSE_ANGLE_BRACKET:{
+        operator = jj_consume_token(CLOSE_ANGLE_BRACKET);
+        break;
+        }
+      default:
+        jj_la1[26] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[26] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
 {if ("" != null) return new OperatorSymbol(transformOperator(operator.image));}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("UnaryOperator");
+    }
 }
 
-  final public OperatorSymbol BinaryOperator() throws ParseException {Token operator;
-    operator = jj_consume_token(BINARY_OPERATOR);
+  final public OperatorSymbol BinaryOperator() throws ParseException {
+    trace_call("BinaryOperator");
+    try {
+Token operator;
+      operator = jj_consume_token(BINARY_OPERATOR);
 {if ("" != null) return new OperatorSymbol(transformOperator(operator.image));}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("BinaryOperator");
+    }
 }
 
-  final public TimestampSymbol Timestamp() throws ParseException {Token word;
+  final public TimestampSymbol Timestamp() throws ParseException {
+    trace_call("Timestamp");
+    try {
+Token word;
   String timestamp = "";
-    jj_consume_token(TIMESTAMP);
-    label_6:
-    while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case QUOTED_STRING:{
-        word = jj_consume_token(QUOTED_STRING);
-        break;
-        }
-      case SIGNED_INTEGER:{
-        word = jj_consume_token(SIGNED_INTEGER);
-        break;
-        }
-      case SIGNED_DECIMAL:{
-        word = jj_consume_token(SIGNED_DECIMAL);
-        break;
-        }
-      case NUMERIC:{
-        word = jj_consume_token(NUMERIC);
-        break;
-        }
-      case ALPHANUMERIC:{
-        word = jj_consume_token(ALPHANUMERIC);
+      case TIMESTAMP:{
+        jj_consume_token(TIMESTAMP);
         break;
         }
-      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-        word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+      case IN:{
+        jj_consume_token(IN);
         break;
         }
       default:
@@ -986,59 +1070,97 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         jj_consume_token(-1);
         throw new ParseException();
       }
+      label_6:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case QUOTED_STRING:{
+          word = jj_consume_token(QUOTED_STRING);
+          break;
+          }
+        case SIGNED_INTEGER:{
+          word = jj_consume_token(SIGNED_INTEGER);
+          break;
+          }
+        case SIGNED_DECIMAL:{
+          word = jj_consume_token(SIGNED_DECIMAL);
+          break;
+          }
+        case NUMERIC:{
+          word = jj_consume_token(NUMERIC);
+          break;
+          }
+        case ALPHANUMERIC:{
+          word = jj_consume_token(ALPHANUMERIC);
+          break;
+          }
+        case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+          word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+          break;
+          }
+        default:
+          jj_la1[28] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
 timestamp += (timestamp.equals("")) ? word.image : " " + word.image;
-      if (jj_2_11(2)) {
-        ;
-      } else {
-        break label_6;
+        if (jj_2_11(2)) {
+          ;
+        } else {
+          break label_6;
+        }
       }
-    }
 {if ("" != null) return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp));}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("Timestamp");
+    }
 }
 
-  final public void Page() throws ParseException {/*@bgen(jjtree) Page */
+  final public void Page() throws ParseException {
+    trace_call("Page");
+    try {
+/*@bgen(jjtree) Page */
   ASTPage jjtn000 = new ASTPage(JJTPAGE);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);String number = null;
   String size = null;
-    try {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case PAGE:{
-        number = Number();
+      try {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case PAGE:{
+          number = Number();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case SIZE:{
+            size = Size();
+            break;
+            }
+          default:
+            jj_la1[29] = jj_gen;
+            ;
+          }
+          break;
+          }
         case SIZE:{
           size = Size();
-          break;
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case PAGE:{
+            number = Number();
+            break;
+            }
+          default:
+            jj_la1[30] = jj_gen;
+            ;
           }
-        default:
-          jj_la1[28] = jj_gen;
-          ;
-        }
-        break;
-        }
-      case SIZE:{
-        size = Size();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PAGE:{
-          number = Number();
           break;
           }
         default:
-          jj_la1[29] = jj_gen;
-          ;
-        }
-        break;
+          jj_la1[31] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      default:
-        jj_la1[30] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
 jjtree.closeNodeScope(jjtn000, true);
     jjtc000 = false;
 jjtn000.page(new PageSymbol(number != null ? Integer.parseInt(number) : null, size != null ? Integer.parseInt(size) : null));
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
       jjtree.clearNodeScope(jjtn000);
       jjtc000 = false;
@@ -1052,55 +1174,73 @@ final public void Page() throws ParseException {/*@bgen(jjtree) Page */
       {if (true) throw (ParseException)jjte000;}
     }
     {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
     }
+      }
+    } finally {
+      trace_return("Page");
     }
 }
 
-  final public String Number() throws ParseException {Token number;
-    jj_consume_token(PAGE);
-    number = jj_consume_token(NUMERIC);
+  final public String Number() throws ParseException {
+    trace_call("Number");
+    try {
+Token number;
+      jj_consume_token(PAGE);
+      number = jj_consume_token(NUMERIC);
 {if ("" != null) return number.image;}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("Number");
+    }
 }
 
-  final public String Size() throws ParseException {Token size;
-    jj_consume_token(SIZE);
-    size = jj_consume_token(NUMERIC);
+  final public String Size() throws ParseException {
+    trace_call("Size");
+    try {
+Token size;
+      jj_consume_token(SIZE);
+      size = jj_consume_token(NUMERIC);
 {if ("" != null) return size.image;}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("Size");
+    }
 }
 
-  final public void Order() throws ParseException {/*@bgen(jjtree) Order */
+  final public void Order() throws ParseException {
+    trace_call("Order");
+    try {
+/*@bgen(jjtree) Order */
     ASTOrder jjtn000 = new ASTOrder(JJTORDER);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);OrderSymbol order = new OrderSymbol();
     OrderComponentSymbol orderComponent;
-    try {
-      jj_consume_token(ORDER);
-      orderComponent = OrderClause();
+      try {
+        jj_consume_token(ORDER);
+        orderComponent = OrderClause();
 order.add(orderComponent);
-      label_7:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case COMMA:{
-          ;
-          break;
+        label_7:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case COMMA:{
+            ;
+            break;
+            }
+          default:
+            jj_la1[32] = jj_gen;
+            break label_7;
           }
-        default:
-          jj_la1[31] = jj_gen;
-          break label_7;
-        }
-        jj_consume_token(COMMA);
-        orderComponent = OrderClause();
+          jj_consume_token(COMMA);
+          orderComponent = OrderClause();
 order.add(orderComponent);
-      }
+        }
 jjtree.closeNodeScope(jjtn000, true);
     jjtc000 = false;
 jjtn000.order(order);
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
       jjtree.clearNodeScope(jjtn000);
       jjtc000 = false;
@@ -1114,56 +1254,63 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
       {if (true) throw (ParseException)jjte000;}
     }
     {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
     }
+      }
+    } finally {
+      trace_return("Order");
     }
 }
 
-  final public OrderComponentSymbol OrderClause() throws ParseException {KeyTokenSymbol key;
+  final public OrderComponentSymbol OrderClause() throws ParseException {
+    trace_call("OrderClause");
+    try {
+KeyTokenSymbol key;
     TimestampSymbol timestamp = null;
     DirectionSymbol direction = null;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case OPEN_ANGLE_BRACKET:
-    case CLOSE_ANGLE_BRACKET:{
-      direction = SymbolicDirection();
-      key = Key();
-      break;
-      }
-    case RESERVED_IDENTIFIER:
-    case NUMERIC:
-    case SIGNED_INTEGER:
-    case SIGNED_DECIMAL:
-    case ALPHANUMERIC:
-    case PERIOD_SEPARATED_STRING:{
-      key = Key();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ASC:
-      case DESC:{
-        direction = WordDirection();
+      case OPEN_ANGLE_BRACKET:
+      case CLOSE_ANGLE_BRACKET:{
+        direction = SymbolicDirection();
+        key = Key();
+        break;
+        }
+      case RESERVED_IDENTIFIER:
+      case NUMERIC:
+      case SIGNED_INTEGER:
+      case SIGNED_DECIMAL:
+      case ALPHANUMERIC:
+      case PERIOD_SEPARATED_STRING:{
+        key = Key();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case ASC:
+        case DESC:{
+          direction = WordDirection();
+          break;
+          }
+        default:
+          jj_la1[33] = jj_gen;
+          ;
+        }
         break;
         }
       default:
-        jj_la1[32] = jj_gen;
-        ;
-      }
-      break;
+        jj_la1[34] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[33] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case TIMESTAMP:{
-      timestamp = Timestamp();
-      break;
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case TIMESTAMP:{
+        timestamp = Timestamp();
+        break;
+        }
+      default:
+        jj_la1[35] = jj_gen;
+        ;
       }
-    default:
-      jj_la1[34] = jj_gen;
-      ;
-    }
 if(direction != null) {
           if(timestamp != null) {
               {if ("" != null) return new OrderComponentSymbol(key, timestamp, direction);}
@@ -1183,71 +1330,89 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
           }
       }
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("OrderClause");
+    }
 }
 
-  final public DirectionSymbol SymbolicDirection() throws ParseException {Token direction;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case OPEN_ANGLE_BRACKET:{
-      direction = jj_consume_token(OPEN_ANGLE_BRACKET);
+  final public DirectionSymbol SymbolicDirection() throws ParseException {
+    trace_call("SymbolicDirection");
+    try {
+Token direction;
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case OPEN_ANGLE_BRACKET:{
+        direction = jj_consume_token(OPEN_ANGLE_BRACKET);
 {if ("" != null) return DirectionSymbol.ASCENDING;}
-      break;
-      }
-    case CLOSE_ANGLE_BRACKET:{
-      direction = jj_consume_token(CLOSE_ANGLE_BRACKET);
+        break;
+        }
+      case CLOSE_ANGLE_BRACKET:{
+        direction = jj_consume_token(CLOSE_ANGLE_BRACKET);
 {if ("" != null) return DirectionSymbol.DESCENDING;}
-      break;
+        break;
+        }
+      default:
+        jj_la1[36] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[35] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("SymbolicDirection");
+    }
 }
 
-  final public DirectionSymbol WordDirection() throws ParseException {Token direction;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ASC:{
-      direction = jj_consume_token(ASC);
+  final public DirectionSymbol WordDirection() throws ParseException {
+    trace_call("WordDirection");
+    try {
+Token direction;
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ASC:{
+        direction = jj_consume_token(ASC);
 {if ("" != null) return DirectionSymbol.ASCENDING;}
-      break;
-      }
-    case DESC:{
-      direction = jj_consume_token(DESC);
+        break;
+        }
+      case DESC:{
+        direction = jj_consume_token(DESC);
 {if ("" != null) return DirectionSymbol.DESCENDING;}
-      break;
+        break;
+        }
+      default:
+        jj_la1[37] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[36] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("WordDirection");
+    }
 }
 
-  final public void Function() throws ParseException {/*@bgen(jjtree) Function */
+  final public void Function() throws ParseException {
+    trace_call("Function");
+    try {
+/*@bgen(jjtree) Function */
     ASTFunction jjtn000 = new ASTFunction(JJTFUNCTION);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);FunctionTokenSymbol function;
-    try {
-      if (jj_2_12(2)) {
-        function = KeyFunction();
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ALPHANUMERIC:{
-          function = ValueFunction();
-          break;
+      try {
+        if (jj_2_12(2)) {
+          function = KeyFunction();
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case ALPHANUMERIC:{
+            function = ValueFunction();
+            break;
+            }
+          default:
+            jj_la1[38] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[37] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
         }
-      }
 jjtree.closeNodeScope(jjtn000, true);
     jjtc000 = false;
 jjtn000.function(function);
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
       jjtree.clearNodeScope(jjtn000);
       jjtc000 = false;
@@ -1261,56 +1426,21 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
       {if (true) throw (ParseException)jjte000;}
     }
     {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
     }
+      }
+    } finally {
+      trace_return("Function");
     }
 }
 
-  final public FunctionKeySymbol KeyFunction() throws ParseException {Token key;
+  final public FunctionKeySymbol KeyFunction() throws ParseException {
+    trace_call("KeyFunction");
+    try {
+Token key;
   Token function;
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SIGNED_INTEGER:{
-      key = jj_consume_token(SIGNED_INTEGER);
-      break;
-      }
-    case SIGNED_DECIMAL:{
-      key = jj_consume_token(SIGNED_DECIMAL);
-      break;
-      }
-    case NUMERIC:{
-      key = jj_consume_token(NUMERIC);
-      break;
-      }
-    case ALPHANUMERIC:{
-      key = jj_consume_token(ALPHANUMERIC);
-      break;
-      }
-    case PERIOD_SEPARATED_STRING:{
-      key = jj_consume_token(PERIOD_SEPARATED_STRING);
-      break;
-      }
-    default:
-      jj_la1[38] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
-    }
-    jj_consume_token(PIPE);
-    function = jj_consume_token(ALPHANUMERIC);
-{if ("" != null) return new FunctionKeySymbol(new ImplicitKeyRecordFunction(function.image, key.image.substring(0, key.image.length())));}
-    throw new Error("Missing return statement in function");
-}
-
-  final public FunctionValueSymbol ValueFunction() throws ParseException {Token function;
-  Token key;
-  Token word;
-  List<String> records = Lists.newArrayList();
-  ASTStart ccl;
-  TimestampSymbol timestamp = null;
-    function = jj_consume_token(ALPHANUMERIC);
-    jj_consume_token(OPEN_PARENTHESES);
-    if (jj_2_13(3)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SIGNED_INTEGER:{
         key = jj_consume_token(SIGNED_INTEGER);
@@ -1320,6 +1450,10 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         key = jj_consume_token(SIGNED_DECIMAL);
         break;
         }
+      case NUMERIC:{
+        key = jj_consume_token(NUMERIC);
+        break;
+        }
       case ALPHANUMERIC:{
         key = jj_consume_token(ALPHANUMERIC);
         break;
@@ -1333,58 +1467,83 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         jj_consume_token(-1);
         throw new ParseException();
       }
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case CLOSE_PARENTHESES:{
-        jj_consume_token(CLOSE_PARENTHESES);
-{if ("" != null) return new FunctionValueSymbol(new IndexFunction(function.image, key.image));}
-        break;
+      jj_consume_token(PIPE);
+      function = jj_consume_token(ALPHANUMERIC);
+{if ("" != null) return new FunctionKeySymbol(new ImplicitKeyRecordFunction(function.image, key.image.substring(0, key.image.length())));}
+    throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("KeyFunction");
+    }
+}
+
+  final public FunctionValueSymbol ValueFunction() throws ParseException {
+    trace_call("ValueFunction");
+    try {
+Token function;
+  Token key;
+  Token word;
+  List<String> records = Lists.newArrayList();
+  ASTStart ccl;
+  TimestampSymbol timestamp = null;
+      function = jj_consume_token(ALPHANUMERIC);
+      jj_consume_token(OPEN_PARENTHESES);
+      if (jj_2_13(3)) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case SIGNED_INTEGER:{
+          key = jj_consume_token(SIGNED_INTEGER);
+          break;
+          }
+        case SIGNED_DECIMAL:{
+          key = jj_consume_token(SIGNED_DECIMAL);
+          break;
+          }
+        case ALPHANUMERIC:{
+          key = jj_consume_token(ALPHANUMERIC);
+          break;
+          }
+        case PERIOD_SEPARATED_STRING:{
+          key = jj_consume_token(PERIOD_SEPARATED_STRING);
+          break;
+          }
+        default:
+          jj_la1[40] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      case COMMA:{
-        jj_consume_token(COMMA);
-        timestamp = Timestamp();
-        jj_consume_token(CLOSE_PARENTHESES);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case CLOSE_PARENTHESES:{
+          jj_consume_token(CLOSE_PARENTHESES);
+{if ("" != null) return new FunctionValueSymbol(new IndexFunction(function.image, key.image));}
+          break;
+          }
+        case COMMA:{
+          jj_consume_token(COMMA);
+          timestamp = Timestamp();
+          jj_consume_token(CLOSE_PARENTHESES);
 {if ("" != null) return new FunctionValueSymbol(new IndexFunction(function.image, key.image, timestamp.timestamp()));}
-        break;
-        }
-      default:
-        jj_la1[40] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    } else if (jj_2_14(3)) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case SIGNED_INTEGER:{
-        key = jj_consume_token(SIGNED_INTEGER);
-        break;
-        }
-      case SIGNED_DECIMAL:{
-        key = jj_consume_token(SIGNED_DECIMAL);
-        break;
-        }
-      case ALPHANUMERIC:{
-        key = jj_consume_token(ALPHANUMERIC);
-        break;
-        }
-      case PERIOD_SEPARATED_STRING:{
-        key = jj_consume_token(PERIOD_SEPARATED_STRING);
-        break;
+          break;
+          }
+        default:
+          jj_la1[41] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      default:
-        jj_la1[41] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-      jj_consume_token(COMMA);
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NUMERIC:
-      case SIGNED_INTEGER:{
+      } else if (jj_2_14(3)) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case SIGNED_INTEGER:{
-          word = jj_consume_token(SIGNED_INTEGER);
+          key = jj_consume_token(SIGNED_INTEGER);
           break;
           }
-        case NUMERIC:{
-          word = jj_consume_token(NUMERIC);
+        case SIGNED_DECIMAL:{
+          key = jj_consume_token(SIGNED_DECIMAL);
+          break;
+          }
+        case ALPHANUMERIC:{
+          key = jj_consume_token(ALPHANUMERIC);
+          break;
+          }
+        case PERIOD_SEPARATED_STRING:{
+          key = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
         default:
@@ -1392,19 +1551,10 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           jj_consume_token(-1);
           throw new ParseException();
         }
-records.add(word.image);
-        label_8:
-        while (true) {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case COMMA:{
-            ;
-            break;
-            }
-          default:
-            jj_la1[43] = jj_gen;
-            break label_8;
-          }
-          jj_consume_token(COMMA);
+        jj_consume_token(COMMA);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case NUMERIC:
+        case SIGNED_INTEGER:{
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case SIGNED_INTEGER:{
             word = jj_consume_token(SIGNED_INTEGER);
@@ -1415,45 +1565,45 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[44] = jj_gen;
+            jj_la1[43] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
 records.add(word.image);
-        }
-        jj_consume_token(CLOSE_PARENTHESES);
-{if ("" != null) return new FunctionValueSymbol(new KeyRecordsFunction(function.image, key.image, records));}
-        break;
-        }
-      case OPEN_BRACKET:{
-        jj_consume_token(OPEN_BRACKET);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case SIGNED_INTEGER:{
-          word = jj_consume_token(SIGNED_INTEGER);
-          break;
+          label_8:
+          while (true) {
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case COMMA:{
+              ;
+              break;
+              }
+            default:
+              jj_la1[44] = jj_gen;
+              break label_8;
+            }
+            jj_consume_token(COMMA);
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case SIGNED_INTEGER:{
+              word = jj_consume_token(SIGNED_INTEGER);
+              break;
+              }
+            case NUMERIC:{
+              word = jj_consume_token(NUMERIC);
+              break;
+              }
+            default:
+              jj_la1[45] = jj_gen;
+              jj_consume_token(-1);
+              throw new ParseException();
+            }
+records.add(word.image);
           }
-        case NUMERIC:{
-          word = jj_consume_token(NUMERIC);
+          jj_consume_token(CLOSE_PARENTHESES);
+{if ("" != null) return new FunctionValueSymbol(new KeyRecordsFunction(function.image, key.image, records));}
           break;
           }
-        default:
-          jj_la1[45] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-records.add(word.image);
-        label_9:
-        while (true) {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case COMMA:{
-            ;
-            break;
-            }
-          default:
-            jj_la1[46] = jj_gen;
-            break label_9;
-          }
-          jj_consume_token(COMMA);
+        case OPEN_BRACKET:{
+          jj_consume_token(OPEN_BRACKET);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case SIGNED_INTEGER:{
             word = jj_consume_token(SIGNED_INTEGER);
@@ -1464,45 +1614,44 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[47] = jj_gen;
+            jj_la1[46] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
 records.add(word.image);
-        }
-        jj_consume_token(CLOSE_BRACKET);
-        jj_consume_token(COMMA);
-        timestamp = Timestamp();
-        jj_consume_token(CLOSE_PARENTHESES);
-{if ("" != null) return new FunctionValueSymbol(new KeyRecordsFunction(function.image, key.image, records, timestamp.timestamp()));}
-        break;
-        }
-      default:
-        jj_la1[48] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    } else {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case SIGNED_INTEGER:
-      case SIGNED_DECIMAL:
-      case ALPHANUMERIC:
-      case PERIOD_SEPARATED_STRING:{
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case SIGNED_INTEGER:{
-          key = jj_consume_token(SIGNED_INTEGER);
-          break;
-          }
-        case SIGNED_DECIMAL:{
-          key = jj_consume_token(SIGNED_DECIMAL);
-          break;
-          }
-        case ALPHANUMERIC:{
-          key = jj_consume_token(ALPHANUMERIC);
-          break;
+          label_9:
+          while (true) {
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case COMMA:{
+              ;
+              break;
+              }
+            default:
+              jj_la1[47] = jj_gen;
+              break label_9;
+            }
+            jj_consume_token(COMMA);
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case SIGNED_INTEGER:{
+              word = jj_consume_token(SIGNED_INTEGER);
+              break;
+              }
+            case NUMERIC:{
+              word = jj_consume_token(NUMERIC);
+              break;
+              }
+            default:
+              jj_la1[48] = jj_gen;
+              jj_consume_token(-1);
+              throw new ParseException();
+            }
+records.add(word.image);
           }
-        case PERIOD_SEPARATED_STRING:{
-          key = jj_consume_token(PERIOD_SEPARATED_STRING);
+          jj_consume_token(CLOSE_BRACKET);
+          jj_consume_token(COMMA);
+          timestamp = Timestamp();
+          jj_consume_token(CLOSE_PARENTHESES);
+{if ("" != null) return new FunctionValueSymbol(new KeyRecordsFunction(function.image, key.image, records, timestamp.timestamp()));}
           break;
           }
         default:
@@ -1510,136 +1659,182 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           jj_consume_token(-1);
           throw new ParseException();
         }
-        jj_consume_token(COMMA);
-        ccl = generateSubAST();
+      } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case CLOSE_PARENTHESES:{
-          jj_consume_token(CLOSE_PARENTHESES);
-ConditionTree tree = (ConditionTree) ccl.jjtAccept(visitor, null);
-          {if ("" != null) return new FunctionValueSymbol(new KeyConditionFunction(function.image, key.image, tree));}
-          break;
+        case SIGNED_INTEGER:
+        case SIGNED_DECIMAL:
+        case ALPHANUMERIC:
+        case PERIOD_SEPARATED_STRING:{
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case SIGNED_INTEGER:{
+            key = jj_consume_token(SIGNED_INTEGER);
+            break;
+            }
+          case SIGNED_DECIMAL:{
+            key = jj_consume_token(SIGNED_DECIMAL);
+            break;
+            }
+          case ALPHANUMERIC:{
+            key = jj_consume_token(ALPHANUMERIC);
+            break;
+            }
+          case PERIOD_SEPARATED_STRING:{
+            key = jj_consume_token(PERIOD_SEPARATED_STRING);
+            break;
+            }
+          default:
+            jj_la1[50] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        case COMMA:{
           jj_consume_token(COMMA);
-          timestamp = Timestamp();
-          jj_consume_token(CLOSE_PARENTHESES);
+          ccl = generateSubAST();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case CLOSE_PARENTHESES:{
+            jj_consume_token(CLOSE_PARENTHESES);
+ConditionTree tree = (ConditionTree) ccl.jjtAccept(visitor, null);
+          {if ("" != null) return new FunctionValueSymbol(new KeyConditionFunction(function.image, key.image, tree));}
+            break;
+            }
+          case COMMA:{
+            jj_consume_token(COMMA);
+            timestamp = Timestamp();
+            jj_consume_token(CLOSE_PARENTHESES);
 ConditionTree tree = (ConditionTree) ccl.jjtAccept(visitor, null);
           {if ("" != null) return new FunctionValueSymbol(new KeyConditionFunction(function.image, key.image, tree, timestamp.timestamp()));}
+            break;
+            }
+          default:
+            jj_la1[51] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
           break;
           }
         default:
-          jj_la1[50] = jj_gen;
+          jj_la1[52] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
+      }
+    throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("ValueFunction");
+    }
+}
+
+  final public void Command() throws ParseException {
+    trace_call("Command");
+    try {
+
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ADD:
+      case SET:
+      case REMOVE:
+      case CLEAR:
+      case VERIFY_AND_SWAP:
+      case VERIFY_OR_SET:{
+        DataModificationOperations();
+        break;
+        }
+      case INSERT:{
+        RecordOperations();
+        break;
+        }
+      case LINK:
+      case UNLINK:{
+        LinkOperations();
+        break;
+        }
+      case SELECT:
+      case FETCH:
+      case GET:
+      case DESCRIBE:
+      case AUDIT:
+      case VERIFY:
+      case SEARCH:{
+        QueryOperations();
+        break;
+        }
+      case STAGE:
+      case COMMIT:
+      case ABORT:{
+        TransactionOperations();
+        break;
+        }
+      case REVERT:{
+        RevertCommand();
         break;
         }
       default:
-        jj_la1[51] = jj_gen;
+        jj_la1[53] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-    }
-    throw new Error("Missing return statement in function");
-}
-
-  final public void Command() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ADD:
-    case SET:
-    case REMOVE:
-    case CLEAR:
-    case VERIFY_AND_SWAP:
-    case VERIFY_OR_SET:{
-      DataModificationOperations();
-      break;
-      }
-    case INSERT:{
-      RecordOperations();
-      break;
-      }
-    case LINK:
-    case UNLINK:{
-      LinkOperations();
-      break;
-      }
-    case SELECT:
-    case FETCH:
-    case GET:
-    case DESCRIBE:
-    case AUDIT:
-    case VERIFY:
-    case SEARCH:{
-      QueryOperations();
-      break;
-      }
-    case STAGE:
-    case COMMIT:
-    case ABORT:{
-      TransactionOperations();
-      break;
-      }
-    case REVERT:{
-      RevertCommand();
-      break;
-      }
-    default:
-      jj_la1[52] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+    } finally {
+      trace_return("Command");
     }
 }
 
   final public void DataModificationOperations() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ADD:{
-      AddCommand();
-      break;
-      }
-    case SET:{
-      SetCommand();
-      break;
-      }
-    case REMOVE:{
-      RemoveCommand();
-      break;
-      }
-    case CLEAR:{
-      ClearCommand();
-      break;
-      }
-    case VERIFY_AND_SWAP:{
-      VerifyAndSwapCommand();
-      break;
-      }
-    case VERIFY_OR_SET:{
-      VerifyOrSetCommand();
-      break;
+    trace_call("DataModificationOperations");
+    try {
+
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ADD:{
+        AddCommand();
+        break;
+        }
+      case SET:{
+        SetCommand();
+        break;
+        }
+      case REMOVE:{
+        RemoveCommand();
+        break;
+        }
+      case CLEAR:{
+        ClearCommand();
+        break;
+        }
+      case VERIFY_AND_SWAP:{
+        VerifyAndSwapCommand();
+        break;
+        }
+      case VERIFY_OR_SET:{
+        VerifyOrSetCommand();
+        break;
+        }
+      default:
+        jj_la1[54] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[53] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+    } finally {
+      trace_return("DataModificationOperations");
     }
 }
 
-  final public void AddCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void AddCommand() throws ParseException {
+    trace_call("AddCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
-    try {
-      jj_consume_token(ADD);
-      key = Key();
-      jj_consume_token(AS);
-      value = UnaryValue();
-      jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
+      try {
+        jj_consume_token(ADD);
+        key = Key();
+        jj_consume_token(AS);
+        value = UnaryValue();
+        jj_consume_token(IN);
+        record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new AddSymbol(key, value, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1653,30 +1848,36 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("AddCommand");
     }
 }
 
-  final public void SetCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void SetCommand() throws ParseException {
+    trace_call("SetCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
-    try {
-      jj_consume_token(SET);
-      key = Key();
-      jj_consume_token(AS);
-      value = UnaryValue();
-      jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
+      try {
+        jj_consume_token(SET);
+        key = Key();
+        jj_consume_token(AS);
+        value = UnaryValue();
+        jj_consume_token(IN);
+        record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new SetSymbol(key, value, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1690,51 +1891,57 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-    }
-}
-
-  final public void RemoveCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
-    ValueTokenSymbol<?> value = null;
-    Token record;
-    try {
-      jj_consume_token(REMOVE);
-      key = Key();
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case AS:{
-        jj_consume_token(AS);
-        value = UnaryValue();
-        break;
-        }
-      default:
-        jj_la1[54] = jj_gen;
-        ;
       }
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case FROM:{
-        jj_consume_token(FROM);
-        break;
+    } finally {
+      trace_return("SetCommand");
+    }
+}
+
+  final public void RemoveCommand() throws ParseException {
+    trace_call("RemoveCommand");
+    try {
+/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value = null;
+    Token record;
+      try {
+        jj_consume_token(REMOVE);
+        key = Key();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case AS:{
+          jj_consume_token(AS);
+          value = UnaryValue();
+          break;
+          }
+        default:
+          jj_la1[55] = jj_gen;
+          ;
         }
-      case IN:{
-        jj_consume_token(IN);
-        break;
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case FROM:{
+          jj_consume_token(FROM);
+          break;
+          }
+        case IN:{
+          jj_consume_token(IN);
+          break;
+          }
+        default:
+          jj_la1[56] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      default:
-        jj_la1[55] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-      record = jj_consume_token(NUMERIC);
+        record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new RemoveSymbol(key, value, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1748,61 +1955,67 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("RemoveCommand");
     }
 }
 
-  final public void ClearCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void ClearCommand() throws ParseException {
+    trace_call("ClearCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
     Token record;
     Collection<KeyTokenSymbol<?>> keys = null;
     Collection records = null;
-    try {
-      jj_consume_token(CLEAR);
-      if (jj_2_15(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
+      try {
+        jj_consume_token(CLEAR);
+        if (jj_2_15(3)) {
+          key = Key();
+          jj_consume_token(FROM);
+          record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(key, Long.parseLong(record.image)));
-      } else if (jj_2_16(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        records = RecordCollection();
+        } else if (jj_2_16(3)) {
+          key = Key();
+          jj_consume_token(FROM);
+          records = RecordCollection();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(key, records));
-      } else if (jj_2_17(3)) {
-        keys = KeyCollection();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
+        } else if (jj_2_17(3)) {
+          keys = KeyCollection();
+          jj_consume_token(FROM);
+          record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(keys, Long.parseLong(record.image)));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case OPEN_BRACKET:{
-          keys = KeyCollection();
-          jj_consume_token(FROM);
-          records = RecordCollection();
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case OPEN_BRACKET:{
+            keys = KeyCollection();
+            jj_consume_token(FROM);
+            records = RecordCollection();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(keys, records));
-          break;
+            break;
+            }
+          default:
+            jj_la1[57] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[56] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
         }
-      }
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1816,33 +2029,39 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("ClearCommand");
     }
 }
 
-  final public void VerifyAndSwapCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void VerifyAndSwapCommand() throws ParseException {
+    trace_call("VerifyAndSwapCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> expected;
     ValueTokenSymbol<?> replacement;
     Token record;
-    try {
-      jj_consume_token(VERIFY_AND_SWAP);
-      key = Key();
-      jj_consume_token(AS);
-      expected = UnaryValue();
-      jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
-      jj_consume_token(WITH);
-      replacement = UnaryValue();
+      try {
+        jj_consume_token(VERIFY_AND_SWAP);
+        key = Key();
+        jj_consume_token(AS);
+        expected = UnaryValue();
+        jj_consume_token(IN);
+        record = jj_consume_token(NUMERIC);
+        jj_consume_token(WITH);
+        replacement = UnaryValue();
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new VerifyAndSwapSymbol(key, expected, replacement, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1856,30 +2075,36 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("VerifyAndSwapCommand");
     }
 }
 
-  final public void VerifyOrSetCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void VerifyOrSetCommand() throws ParseException {
+    trace_call("VerifyOrSetCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
-    try {
-      jj_consume_token(VERIFY_OR_SET);
-      key = Key();
-      jj_consume_token(AS);
-      value = UnaryValue();
-      jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
+      try {
+        jj_consume_token(VERIFY_OR_SET);
+        key = Key();
+        jj_consume_token(AS);
+        value = UnaryValue();
+        jj_consume_token(IN);
+        record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new VerifyOrSetSymbol(key, value, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1893,71 +2118,83 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("VerifyOrSetCommand");
     }
 }
 
   final public void RecordOperations() throws ParseException {
-    InsertCommand();
+    trace_call("RecordOperations");
+    try {
+
+      InsertCommand();
+    } finally {
+      trace_return("RecordOperations");
+    }
 }
 
-  final public void InsertCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void InsertCommand() throws ParseException {
+    trace_call("InsertCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);String json;
     Token record = null;
     Collection records = null;
-    try {
-      jj_consume_token(INSERT);
-      json = JsonObject();
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case IN:
-      case INTO:{
+      try {
+        jj_consume_token(INSERT);
+        json = JsonObject();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:{
-          jj_consume_token(IN);
-          break;
-          }
+        case IN:
         case INTO:{
-          jj_consume_token(INTO);
-          break;
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:{
+            jj_consume_token(IN);
+            break;
+            }
+          case INTO:{
+            jj_consume_token(INTO);
+            break;
+            }
+          default:
+            jj_la1[58] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[57] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case NUMERIC:{
-          record = jj_consume_token(NUMERIC);
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case NUMERIC:{
+            record = jj_consume_token(NUMERIC);
 jjtn000.command(new InsertSymbol(json, Long.parseLong(record.image)));
-          break;
-          }
-        case OPEN_BRACKET:{
-          records = RecordCollection();
+            break;
+            }
+          case OPEN_BRACKET:{
+            records = RecordCollection();
 jjtn000.command(new InsertSymbol(json, records));
+            break;
+            }
+          default:
+            jj_la1[59] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
           break;
           }
         default:
-          jj_la1[58] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-        break;
+          jj_la1[60] = jj_gen;
+          ;
         }
-      default:
-        jj_la1[59] = jj_gen;
-        ;
-      }
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 if(record == null && records == null) {
             jjtn000.command(new InsertSymbol(json));
         }
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1971,66 +2208,78 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("InsertCommand");
     }
 }
 
   final public void LinkOperations() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case LINK:{
-      LinkCommand();
-      break;
-      }
-    case UNLINK:{
-      UnlinkCommand();
-      break;
+    trace_call("LinkOperations");
+    try {
+
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LINK:{
+        LinkCommand();
+        break;
+        }
+      case UNLINK:{
+        UnlinkCommand();
+        break;
+        }
+      default:
+        jj_la1[61] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[60] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+    } finally {
+      trace_return("LinkOperations");
     }
 }
 
-  final public void LinkCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void LinkCommand() throws ParseException {
+    trace_call("LinkCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
-    try {
-      jj_consume_token(LINK);
-      key = Key();
-      jj_consume_token(FROM);
-      source = jj_consume_token(NUMERIC);
-      jj_consume_token(TO);
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NUMERIC:{
-        destination = jj_consume_token(NUMERIC);
+      try {
+        jj_consume_token(LINK);
+        key = Key();
+        jj_consume_token(FROM);
+        source = jj_consume_token(NUMERIC);
+        jj_consume_token(TO);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case NUMERIC:{
+          destination = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 Collection dest = new ArrayList();
             dest.add(Long.parseLong(destination.image));
             jjtn000.command(new LinkSymbol(key, Long.parseLong(source.image), dest));
-        break;
-        }
-      case OPEN_BRACKET:{
-        destinations = RecordCollection();
+          break;
+          }
+        case OPEN_BRACKET:{
+          destinations = RecordCollection();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new LinkSymbol(key, Long.parseLong(source.image), destinations));
-        break;
+          break;
+          }
+        default:
+          jj_la1[62] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      default:
-        jj_la1[61] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2044,49 +2293,55 @@ final public void LinkCommand() throws ParseException {/*@bgen(jjtree) Command *
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("LinkCommand");
     }
 }
 
-  final public void UnlinkCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void UnlinkCommand() throws ParseException {
+    trace_call("UnlinkCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
-    try {
-      jj_consume_token(UNLINK);
-      key = Key();
-      jj_consume_token(FROM);
-      source = jj_consume_token(NUMERIC);
-      jj_consume_token(TO);
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NUMERIC:{
-        destination = jj_consume_token(NUMERIC);
+      try {
+        jj_consume_token(UNLINK);
+        key = Key();
+        jj_consume_token(FROM);
+        source = jj_consume_token(NUMERIC);
+        jj_consume_token(TO);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case NUMERIC:{
+          destination = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 Collection dest = new ArrayList();
             dest.add(Long.parseLong(destination.image));
             jjtn000.command(new UnlinkSymbol(key, Long.parseLong(source.image), dest));
-        break;
-        }
-      case OPEN_BRACKET:{
-        destinations = RecordCollection();
+          break;
+          }
+        case OPEN_BRACKET:{
+          destinations = RecordCollection();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new UnlinkSymbol(key, Long.parseLong(source.image), destinations));
-        break;
+          break;
+          }
+        default:
+          jj_la1[63] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      default:
-        jj_la1[62] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2100,74 +2355,87 @@ final public void UnlinkCommand() throws ParseException {/*@bgen(jjtree) Command
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("UnlinkCommand");
     }
 }
 
   final public void QueryOperations() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case SELECT:{
-      SelectCommand();
-      break;
-      }
-    case FETCH:{
-      FetchCommand();
-      break;
-      }
-    case GET:{
-      GetCommand();
-      break;
-      }
-    case DESCRIBE:{
-      DescribeCommand();
-      break;
-      }
-    case AUDIT:{
-      AuditCommand();
-      break;
-      }
-    case VERIFY:{
-      VerifyCommand();
-      break;
-      }
-    case SEARCH:{
-      SearchCommand();
-      break;
+    trace_call("QueryOperations");
+    try {
+
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case SELECT:{
+        SelectCommand();
+        break;
+        }
+      case FETCH:{
+        FetchCommand();
+        break;
+        }
+      case GET:{
+        GetCommand();
+        break;
+        }
+      case DESCRIBE:{
+        DescribeCommand();
+        break;
+        }
+      case AUDIT:{
+        AuditCommand();
+        break;
+        }
+      case VERIFY:{
+        VerifyCommand();
+        break;
+        }
+      case SEARCH:{
+        SearchCommand();
+        break;
+        }
+      default:
+        jj_la1[64] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[63] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+    } finally {
+      trace_return("QueryOperations");
     }
 }
 
-  final public void SelectCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void SelectCommand() throws ParseException {
+    trace_call("SelectCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token record;
     TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(SELECT);
-      key = Key();
-      jj_consume_token(FROM);
-      record = jj_consume_token(NUMERIC);
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case TIMESTAMP:{
-        timestamp = Timestamp();
-        break;
+      try {
+        jj_consume_token(SELECT);
+        key = Key();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
+          break;
+          }
+        default:
+          jj_la1[65] = jj_gen;
+          ;
         }
-      default:
-        jj_la1[64] = jj_gen;
-        ;
-      }
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new SelectSymbol(key, Long.parseLong(record.image), timestamp));
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2181,14 +2449,20 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("SelectCommand");
     }
 }
 
-  final public void FetchCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void FetchCommand() throws ParseException {
+    trace_call("FetchCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
@@ -2196,63 +2470,48 @@ final public void FetchCommand() throws ParseException {/*@bgen(jjtree) Command
     Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(FETCH);
-      if (jj_2_18(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
-          break;
+      try {
+        jj_consume_token(FETCH);
+        if (jj_2_18(3)) {
+          key = Key();
+          jj_consume_token(FROM);
+          record = jj_consume_token(NUMERIC);
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
+          case TIMESTAMP:{
+            timestamp = Timestamp();
+            break;
+            }
+          default:
+            jj_la1[66] = jj_gen;
+            ;
           }
-        default:
-          jj_la1[65] = jj_gen;
-          ;
-        }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new FetchSymbol(key, Long.parseLong(record.image), timestamp));
-      } else if (jj_2_19(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        records = RecordCollection();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
-          break;
+        } else if (jj_2_19(3)) {
+          key = Key();
+          jj_consume_token(FROM);
+          records = RecordCollection();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
+          case TIMESTAMP:{
+            timestamp = Timestamp();
+            break;
+            }
+          default:
+            jj_la1[67] = jj_gen;
+            ;
           }
-        default:
-          jj_la1[66] = jj_gen;
-          ;
-        }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new FetchSymbol(key, records, timestamp));
-      } else if (jj_2_20(3)) {
-        keys = KeyCollection();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
-          break;
-          }
-        default:
-          jj_la1[67] = jj_gen;
-          ;
-        }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case OPEN_BRACKET:{
+        } else if (jj_2_20(3)) {
           keys = KeyCollection();
           jj_consume_token(FROM);
-          records = RecordCollection();
+          record = jj_consume_token(NUMERIC);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
           case TIMESTAMP:{
             timestamp = Timestamp();
             break;
@@ -2263,16 +2522,35 @@ record = jj_consume_token(NUMERIC);
           }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
+jjtn000.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case OPEN_BRACKET:{
+            keys = KeyCollection();
+            jj_consume_token(FROM);
+            records = RecordCollection();
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case IN:
+            case TIMESTAMP:{
+              timestamp = Timestamp();
+              break;
+              }
+            default:
+              jj_la1[69] = jj_gen;
+              ;
+            }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
 jjtn000.command(new FetchSymbol(keys, records, timestamp));
-          break;
+            break;
+            }
+          default:
+            jj_la1[70] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[69] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
         }
-      }
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2286,14 +2564,20 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("FetchCommand");
     }
 }
 
-  final public void GetCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void GetCommand() throws ParseException {
+    trace_call("GetCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
@@ -2301,63 +2585,48 @@ final public void GetCommand() throws ParseException {/*@bgen(jjtree) Command */
     Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(GET);
-      if (jj_2_21(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
-          break;
+      try {
+        jj_consume_token(GET);
+        if (jj_2_21(3)) {
+          key = Key();
+          jj_consume_token(FROM);
+          record = jj_consume_token(NUMERIC);
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
+          case TIMESTAMP:{
+            timestamp = Timestamp();
+            break;
+            }
+          default:
+            jj_la1[71] = jj_gen;
+            ;
           }
-        default:
-          jj_la1[70] = jj_gen;
-          ;
-        }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new GetSymbol(key, Long.parseLong(record.image), timestamp));
-      } else if (jj_2_22(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        records = RecordCollection();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
-          break;
+        } else if (jj_2_22(3)) {
+          key = Key();
+          jj_consume_token(FROM);
+          records = RecordCollection();
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
+          case TIMESTAMP:{
+            timestamp = Timestamp();
+            break;
+            }
+          default:
+            jj_la1[72] = jj_gen;
+            ;
           }
-        default:
-          jj_la1[71] = jj_gen;
-          ;
-        }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new GetSymbol(key, records, timestamp));
-      } else if (jj_2_23(3)) {
-        keys = KeyCollection();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
-          break;
-          }
-        default:
-          jj_la1[72] = jj_gen;
-          ;
-        }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case OPEN_BRACKET:{
+        } else if (jj_2_23(3)) {
           keys = KeyCollection();
           jj_consume_token(FROM);
-          records = RecordCollection();
+          record = jj_consume_token(NUMERIC);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
           case TIMESTAMP:{
             timestamp = Timestamp();
             break;
@@ -2368,16 +2637,35 @@ record = jj_consume_token(NUMERIC);
           }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
+jjtn000.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case OPEN_BRACKET:{
+            keys = KeyCollection();
+            jj_consume_token(FROM);
+            records = RecordCollection();
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case IN:
+            case TIMESTAMP:{
+              timestamp = Timestamp();
+              break;
+              }
+            default:
+              jj_la1[74] = jj_gen;
+              ;
+            }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
 jjtn000.command(new GetSymbol(keys, records, timestamp));
-          break;
+            break;
+            }
+          default:
+            jj_la1[75] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[74] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
         }
-      }
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2391,40 +2679,31 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("GetCommand");
     }
 }
 
-  final public void DescribeCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void DescribeCommand() throws ParseException {
+    trace_call("DescribeCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(DESCRIBE);
-      if (jj_2_24(2)) {
-        record = jj_consume_token(NUMERIC);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case TIMESTAMP:{
-          timestamp = Timestamp();
-          break;
-          }
-        default:
-          jj_la1[75] = jj_gen;
-          ;
-        }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case OPEN_BRACKET:{
-          records = RecordCollection();
+      try {
+        jj_consume_token(DESCRIBE);
+        if (jj_2_24(2)) {
+          record = jj_consume_token(NUMERIC);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
           case TIMESTAMP:{
             timestamp = Timestamp();
             break;
@@ -2435,16 +2714,33 @@ record = jj_consume_token(NUMERIC);
           }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
+jjtn000.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case OPEN_BRACKET:{
+            records = RecordCollection();
+            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+            case IN:
+            case TIMESTAMP:{
+              timestamp = Timestamp();
+              break;
+              }
+            default:
+              jj_la1[77] = jj_gen;
+              ;
+            }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
 jjtn000.command(new DescribeSymbol(records, timestamp));
-          break;
+            break;
+            }
+          default:
+            jj_la1[78] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[77] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
         }
-      }
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2458,43 +2754,49 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("DescribeCommand");
     }
 }
 
-  final public void AuditCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void AuditCommand() throws ParseException {
+    trace_call("AuditCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
     Token record;
-    try {
-      jj_consume_token(AUDIT);
-      if (jj_2_25(2)) {
-        key = Key();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
+      try {
+        jj_consume_token(AUDIT);
+        if (jj_2_25(2)) {
+          key = Key();
+          jj_consume_token(FROM);
+          record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new AuditSymbol(key, Long.parseLong(record.image)));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case NUMERIC:{
-          record = jj_consume_token(NUMERIC);
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case NUMERIC:{
+            record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new AuditSymbol(null, Long.parseLong(record.image)));
-          break;
-          }
-        default:
-          jj_la1[78] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+            break;
+            }
+          default:
+            jj_la1[79] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
         }
-      }
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2508,40 +2810,47 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("AuditCommand");
     }
 }
 
-  final public void VerifyCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void VerifyCommand() throws ParseException {
+    trace_call("VerifyCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
     TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(VERIFY);
-      key = Key();
-      jj_consume_token(AS);
-      value = UnaryValue();
-      jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case TIMESTAMP:{
-        timestamp = Timestamp();
-        break;
+      try {
+        jj_consume_token(VERIFY);
+        key = Key();
+        jj_consume_token(AS);
+        value = UnaryValue();
+        jj_consume_token(IN);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
+          break;
+          }
+        default:
+          jj_la1[80] = jj_gen;
+          ;
         }
-      default:
-        jj_la1[79] = jj_gen;
-        ;
-      }
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new VerifySymbol(key, value, Long.parseLong(record.image), timestamp));
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2555,27 +2864,33 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("VerifyCommand");
     }
 }
 
-  final public void SearchCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void SearchCommand() throws ParseException {
+    trace_call("SearchCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token query;
-    try {
-      jj_consume_token(SEARCH);
-      key = Key();
-      jj_consume_token(FOR);
-      query = jj_consume_token(QUOTED_STRING);
+      try {
+        jj_consume_token(SEARCH);
+        key = Key();
+        jj_consume_token(FOR);
+        query = jj_consume_token(QUOTED_STRING);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new SearchSymbol(key, query.image));
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2589,83 +2904,113 @@ final public void SearchCommand() throws ParseException {/*@bgen(jjtree) Command
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("SearchCommand");
     }
 }
 
   final public void TransactionOperations() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case STAGE:{
-      StageCommand();
-      break;
-      }
-    case COMMIT:{
-      CommitCommand();
-      break;
-      }
-    case ABORT:{
-      AbortCommand();
-      break;
+    trace_call("TransactionOperations");
+    try {
+
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case STAGE:{
+        StageCommand();
+        break;
+        }
+      case COMMIT:{
+        CommitCommand();
+        break;
+        }
+      case ABORT:{
+        AbortCommand();
+        break;
+        }
+      default:
+        jj_la1[81] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    default:
-      jj_la1[80] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
+    } finally {
+      trace_return("TransactionOperations");
     }
 }
 
-  final public void StageCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void StageCommand() throws ParseException {
+    trace_call("StageCommand");
+    try {
+/*@bgen(jjtree) Command */
   ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-    try {
-      jj_consume_token(STAGE);
+      try {
+        jj_consume_token(STAGE);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(StageSymbol.INSTANCE);
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("StageCommand");
     }
 }
 
-  final public void CommitCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void CommitCommand() throws ParseException {
+    trace_call("CommitCommand");
+    try {
+/*@bgen(jjtree) Command */
   ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-    try {
-      jj_consume_token(COMMIT);
+      try {
+        jj_consume_token(COMMIT);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(CommitSymbol.INSTANCE);
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("CommitCommand");
     }
 }
 
-  final public void AbortCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void AbortCommand() throws ParseException {
+    trace_call("AbortCommand");
+    try {
+/*@bgen(jjtree) Command */
   ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-    try {
-      jj_consume_token(ABORT);
+      try {
+        jj_consume_token(ABORT);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(AbortSymbol.INSTANCE);
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("AbortCommand");
     }
 }
 
-  final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command */
+  final public void RevertCommand() throws ParseException {
+    trace_call("RevertCommand");
+    try {
+/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
@@ -2673,51 +3018,51 @@ final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command
     Collection<KeyTokenSymbol<?>> keys = null;
     Collection<Long> records = null;
     TimestampSymbol timestamp;
-    try {
-      jj_consume_token(REVERT);
-      if (jj_2_26(3)) {
-        key = Key();
-        jj_consume_token(IN);
-        record = jj_consume_token(NUMERIC);
-        timestamp = Timestamp();
+      try {
+        jj_consume_token(REVERT);
+        if (jj_2_26(3)) {
+          key = Key();
+          jj_consume_token(IN);
+          record = jj_consume_token(NUMERIC);
+          timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(key, Long.parseLong(record.image), timestamp));
-      } else if (jj_2_27(3)) {
-        key = Key();
-        jj_consume_token(IN);
-        records = RecordCollection();
-        timestamp = Timestamp();
+        } else if (jj_2_27(3)) {
+          key = Key();
+          jj_consume_token(IN);
+          records = RecordCollection();
+          timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(key, records, timestamp));
-      } else if (jj_2_28(3)) {
-        keys = KeyCollection();
-        jj_consume_token(IN);
-        record = jj_consume_token(NUMERIC);
-        timestamp = Timestamp();
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case OPEN_BRACKET:{
+        } else if (jj_2_28(3)) {
           keys = KeyCollection();
           jj_consume_token(IN);
-          records = RecordCollection();
+          record = jj_consume_token(NUMERIC);
           timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
+jjtn000.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
+        } else {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case OPEN_BRACKET:{
+            keys = KeyCollection();
+            jj_consume_token(IN);
+            records = RecordCollection();
+            timestamp = Timestamp();
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
 jjtn000.command(new RevertSymbol(keys, records, timestamp));
-          break;
+            break;
+            }
+          default:
+            jj_la1[82] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[81] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
         }
-      }
-    } catch (Throwable jjte000) {
+      } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2731,68 +3076,89 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-    } finally {
+      } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
+      }
+    } finally {
+      trace_return("RevertCommand");
     }
 }
 
 // Utility parsing rules
-  final public Collection RecordCollection() throws ParseException {Token record;
+  final public Collection RecordCollection() throws ParseException {
+    trace_call("RecordCollection");
+    try {
+Token record;
     Collection records = new ArrayList();
-    jj_consume_token(OPEN_BRACKET);
-    record = jj_consume_token(NUMERIC);
+      jj_consume_token(OPEN_BRACKET);
+      record = jj_consume_token(NUMERIC);
 records.add(Long.parseLong(record.image));
-    label_10:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case COMMA:{
-        ;
-        break;
+      label_10:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[83] = jj_gen;
+          break label_10;
         }
-      default:
-        jj_la1[82] = jj_gen;
-        break label_10;
-      }
-      jj_consume_token(COMMA);
-      record = jj_consume_token(NUMERIC);
+        jj_consume_token(COMMA);
+        record = jj_consume_token(NUMERIC);
 records.add(Long.parseLong(record.image));
-    }
-    jj_consume_token(CLOSE_BRACKET);
+      }
+      jj_consume_token(CLOSE_BRACKET);
 {if ("" != null) return records;}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("RecordCollection");
+    }
 }
 
-  final public Collection KeyCollection() throws ParseException {KeyTokenSymbol key;
+  final public Collection KeyCollection() throws ParseException {
+    trace_call("KeyCollection");
+    try {
+KeyTokenSymbol key;
     Collection keys = new ArrayList();
-    jj_consume_token(OPEN_BRACKET);
-    key = Key();
+      jj_consume_token(OPEN_BRACKET);
+      key = Key();
 keys.add(key.toString());
-    label_11:
-    while (true) {
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case COMMA:{
-        ;
-        break;
+      label_11:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
+          ;
+          break;
+          }
+        default:
+          jj_la1[84] = jj_gen;
+          break label_11;
         }
-      default:
-        jj_la1[83] = jj_gen;
-        break label_11;
-      }
-      jj_consume_token(COMMA);
-      key = Key();
+        jj_consume_token(COMMA);
+        key = Key();
 keys.add(key.toString());
-    }
-    jj_consume_token(CLOSE_BRACKET);
+      }
+      jj_consume_token(CLOSE_BRACKET);
 {if ("" != null) return keys;}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("KeyCollection");
+    }
 }
 
-  final public String JsonObject() throws ParseException {Token content;
-    content = jj_consume_token(QUOTED_STRING);
+  final public String JsonObject() throws ParseException {
+    trace_call("JsonObject");
+    try {
+Token content;
+      content = jj_consume_token(QUOTED_STRING);
 {if ("" != null) return content.image;}
     throw new Error("Missing return statement in function");
+    } finally {
+      trace_return("JsonObject");
+    }
 }
 
   private boolean jj_2_1(int xla)
@@ -3019,12 +3385,6 @@ private boolean jj_2_28(int xla)
     finally { jj_save(27, xla); }
   }
 
-  private boolean jj_3R_47()
- {
-    if (jj_3R_69()) return true;
-    return false;
-  }
-
   private boolean jj_3R_46()
  {
     if (jj_3R_68()) return true;
@@ -3054,6 +3414,12 @@ private boolean jj_3_6()
     return false;
   }
 
+  private boolean jj_3R_45()
+ {
+    if (jj_3R_67()) return true;
+    return false;
+  }
+
   private boolean jj_3R_98()
  {
     Token xsp;
@@ -3065,16 +3431,11 @@ private boolean jj_3R_98()
     return false;
   }
 
-  private boolean jj_3R_45()
- {
-    if (jj_3R_67()) return true;
-    return false;
-  }
-
   private boolean jj_3R_81()
  {
-    if (jj_scan_token(STAGE)) return true;
-    return false;
+    if (!jj_rescan) trace_call("StageCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(STAGE)) { if (!jj_rescan) trace_return("StageCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("StageCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_44()
@@ -3091,32 +3452,34 @@ private boolean jj_3R_43()
 
   private boolean jj_3R_85()
  {
+    if (!jj_rescan) trace_call("UnaryValue(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_7()) {
     jj_scanpos = xsp;
     if (jj_3R_98()) {
     jj_scanpos = xsp;
-    if (jj_3R_99()) return true;
+    if (jj_3R_99()) { if (!jj_rescan) trace_return("UnaryValue(LOOKAHEAD FAILED)"); return true; }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("UnaryValue(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
-  private boolean jj_3_7()
+  private boolean jj_3R_60()
  {
-    if (jj_3R_15()) return true;
+    if (jj_3R_83()) return true;
     return false;
   }
 
-  private boolean jj_3R_60()
+  private boolean jj_3_7()
  {
-    if (jj_3R_83()) return true;
+    if (jj_3R_15()) return true;
     return false;
   }
 
   private boolean jj_3R_35()
  {
+    if (!jj_rescan) trace_call("DataModificationOperations(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_42()) {
@@ -3129,13 +3492,13 @@ private boolean jj_3R_35()
     jj_scanpos = xsp;
     if (jj_3R_46()) {
     jj_scanpos = xsp;
-    if (jj_3R_47()) return true;
+    if (jj_3R_47()) { if (!jj_rescan) trace_return("DataModificationOperations(LOOKAHEAD FAILED)"); return true; }
     }
     }
     }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("DataModificationOperations(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_42()
@@ -3150,15 +3513,39 @@ private boolean jj_3R_59()
     return false;
   }
 
-  private boolean jj_3R_73()
+  private boolean jj_3_11()
  {
-    if (jj_scan_token(UNLINK)) return true;
-    if (jj_3R_20()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(64)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(69)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(67)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
+  private boolean jj_3R_73()
+ {
+    if (!jj_rescan) trace_call("UnlinkCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(UNLINK)) { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(FROM)) { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD SUCCEEDED)"); return false; }
+  }
+
   private boolean jj_3R_29()
  {
     if (jj_3R_40()) return true;
@@ -3173,16 +3560,17 @@ private boolean jj_3R_58()
 
   private boolean jj_3R_39()
  {
+    if (!jj_rescan) trace_call("TransactionOperations(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_58()) {
     jj_scanpos = xsp;
     if (jj_3R_59()) {
     jj_scanpos = xsp;
-    if (jj_3R_60()) return true;
+    if (jj_3R_60()) { if (!jj_rescan) trace_return("TransactionOperations(LOOKAHEAD FAILED)"); return true; }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("TransactionOperations(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_28()
@@ -3203,29 +3591,6 @@ private boolean jj_3R_26()
     return false;
   }
 
-  private boolean jj_3_11()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(64)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(67)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
   private boolean jj_3R_25()
  {
     if (jj_3R_36()) return true;
@@ -3234,11 +3599,12 @@ private boolean jj_3R_25()
 
   private boolean jj_3R_80()
  {
-    if (jj_scan_token(SEARCH)) return true;
-    if (jj_3R_20()) return true;
-    if (jj_scan_token(FOR)) return true;
-    if (jj_scan_token(QUOTED_STRING)) return true;
-    return false;
+    if (!jj_rescan) trace_call("SearchCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(SEARCH)) { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(FOR)) { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(QUOTED_STRING)) { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_33()
@@ -3249,6 +3615,7 @@ private boolean jj_3R_33()
 
   private boolean jj_3R_12()
  {
+    if (!jj_rescan) trace_call("Command(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_24()) {
@@ -3261,13 +3628,13 @@ private boolean jj_3R_12()
     jj_scanpos = xsp;
     if (jj_3R_28()) {
     jj_scanpos = xsp;
-    if (jj_3R_29()) return true;
+    if (jj_3R_29()) { if (!jj_rescan) trace_return("Command(LOOKAHEAD FAILED)"); return true; }
     }
     }
     }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("Command(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_24()
@@ -3304,52 +3671,61 @@ private boolean jj_3_5()
 
   private boolean jj_3R_20()
  {
+    if (!jj_rescan) trace_call("Key(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_5()) {
     jj_scanpos = xsp;
     if (jj_3R_32()) {
     jj_scanpos = xsp;
-    if (jj_3R_33()) return true;
+    if (jj_3R_33()) { if (!jj_rescan) trace_return("Key(LOOKAHEAD FAILED)"); return true; }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("Key(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_31()
  {
-    if (jj_scan_token(TIMESTAMP)) return true;
+    if (!jj_rescan) trace_call("Timestamp(LOOKING AHEAD...)");
     Token xsp;
-    if (jj_3_11()) return true;
+    xsp = jj_scanpos;
+    if (jj_scan_token(37)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(23)) { if (!jj_rescan) trace_return("Timestamp(LOOKAHEAD FAILED)"); return true; }
+    }
+    if (jj_3_11()) { if (!jj_rescan) trace_return("Timestamp(LOOKAHEAD FAILED)"); return true; }
     while (true) {
       xsp = jj_scanpos;
       if (jj_3_11()) { jj_scanpos = xsp; break; }
     }
-    return false;
+    { if (!jj_rescan) trace_return("Timestamp(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_79()
  {
-    if (jj_scan_token(VERIFY)) return true;
-    if (jj_3R_20()) return true;
-    if (jj_scan_token(AS)) return true;
-    if (jj_3R_85()) return true;
-    return false;
+    if (!jj_rescan) trace_call("VerifyCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(VERIFY)) { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_85()) { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_72()
  {
-    if (jj_scan_token(LINK)) return true;
-    if (jj_3R_20()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
-    return false;
+    if (!jj_rescan) trace_call("LinkCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(LINK)) { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(FROM)) { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_105()
  {
-    if (jj_scan_token(BINARY_OPERATOR)) return true;
-    return false;
+    if (!jj_rescan) trace_call("BinaryOperator(LOOKING AHEAD...)");
+    if (jj_scan_token(BINARY_OPERATOR)) { if (!jj_rescan) trace_return("BinaryOperator(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("BinaryOperator(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_97()
@@ -3366,29 +3742,22 @@ private boolean jj_3R_96()
     return false;
   }
 
-  private boolean jj_3R_95()
- {
-    if (jj_3R_102()) return true;
-    if (jj_3R_103()) return true;
-    return false;
-  }
-
   private boolean jj_3R_93()
  {
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_19()
+  private boolean jj_3R_95()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_102()) return true;
+    if (jj_3R_103()) return true;
     return false;
   }
 
-  private boolean jj_3R_94()
+  private boolean jj_3R_19()
  {
-    if (jj_3R_100()) return true;
-    if (jj_3R_101()) return true;
+    if (jj_scan_token(OPEN_BRACKET)) return true;
     return false;
   }
 
@@ -3398,29 +3767,23 @@ private boolean jj_3R_50()
     return false;
   }
 
-  private boolean jj_3R_104()
+  private boolean jj_3R_94()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(42)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(44)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(45)) return true;
-    }
-    }
+    if (jj_3R_100()) return true;
+    if (jj_3R_101()) return true;
     return false;
   }
 
   private boolean jj_3R_37()
  {
+    if (!jj_rescan) trace_call("LinkOperations(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_49()) {
     jj_scanpos = xsp;
-    if (jj_3R_50()) return true;
+    if (jj_3R_50()) { if (!jj_rescan) trace_return("LinkOperations(LOOKAHEAD FAILED)"); return true; }
     }
-    return false;
+    { if (!jj_rescan) trace_return("LinkOperations(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_49()
@@ -3429,6 +3792,21 @@ private boolean jj_3R_49()
     return false;
   }
 
+  private boolean jj_3R_104()
+ {
+    if (!jj_rescan) trace_call("UnaryOperator(LOOKING AHEAD...)");
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(42)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(44)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(45)) { if (!jj_rescan) trace_return("UnaryOperator(LOOKAHEAD FAILED)"); return true; }
+    }
+    }
+    { if (!jj_rescan) trace_return("UnaryOperator(LOOKAHEAD SUCCEEDED)"); return false; }
+  }
+
   private boolean jj_3R_18()
  {
     Token xsp;
@@ -3448,9 +3826,16 @@ private boolean jj_3_25()
     return false;
   }
 
+  private boolean jj_3R_23()
+ {
+    if (jj_3R_31()) return true;
+    return false;
+  }
+
   private boolean jj_3R_84()
  {
-    if (jj_3R_20()) return true;
+    if (!jj_rescan) trace_call("RelationalExpression(LOOKING AHEAD...)");
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("RelationalExpression(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_94()) {
@@ -3459,17 +3844,11 @@ private boolean jj_3R_84()
     jj_scanpos = xsp;
     if (jj_3R_96()) {
     jj_scanpos = xsp;
-    if (jj_3R_97()) return true;
+    if (jj_3R_97()) { if (!jj_rescan) trace_return("RelationalExpression(LOOKAHEAD FAILED)"); return true; }
     }
     }
     }
-    return false;
-  }
-
-  private boolean jj_3R_23()
- {
-    if (jj_3R_31()) return true;
-    return false;
+    { if (!jj_rescan) trace_return("RelationalExpression(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_89()
@@ -3478,33 +3857,17 @@ private boolean jj_3R_89()
     return false;
   }
 
-  private boolean jj_3R_102()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(53)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(54)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(55)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(56)) return true;
-    }
-    }
-    }
-    return false;
-  }
-
   private boolean jj_3R_78()
  {
-    if (jj_scan_token(AUDIT)) return true;
+    if (!jj_rescan) trace_call("AuditCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(AUDIT)) { if (!jj_rescan) trace_return("AuditCommand(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_25()) {
     jj_scanpos = xsp;
-    if (jj_3R_93()) return true;
+    if (jj_3R_93()) { if (!jj_rescan) trace_return("AuditCommand(LOOKAHEAD FAILED)"); return true; }
     }
-    return false;
+    { if (!jj_rescan) trace_return("AuditCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_17()
@@ -3537,6 +3900,24 @@ private boolean jj_3_14()
     return false;
   }
 
+  private boolean jj_3R_102()
+ {
+    if (!jj_rescan) trace_call("RegexBasedOperator(LOOKING AHEAD...)");
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(53)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(54)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(55)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(56)) { if (!jj_rescan) trace_return("RegexBasedOperator(LOOKAHEAD FAILED)"); return true; }
+    }
+    }
+    }
+    { if (!jj_rescan) trace_return("RegexBasedOperator(LOOKAHEAD SUCCEEDED)"); return false; }
+  }
+
   private boolean jj_3R_16()
  {
     if (jj_scan_token(CLOSE_PARENTHESES)) return true;
@@ -3551,8 +3932,9 @@ private boolean jj_3R_88()
 
   private boolean jj_3R_100()
  {
-    if (jj_scan_token(LINKS_TO)) return true;
-    return false;
+    if (!jj_rescan) trace_call("LinksToOperator(LOOKING AHEAD...)");
+    if (jj_scan_token(LINKS_TO)) { if (!jj_rescan) trace_return("LinksToOperator(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("LinksToOperator(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_92()
@@ -3561,24 +3943,6 @@ private boolean jj_3R_92()
     return false;
   }
 
-  private boolean jj_3R_62()
- {
-    if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    if (jj_3R_13()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_41()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_62()) {
-    jj_scanpos = xsp;
-    if (jj_3R_63()) return true;
-    }
-    return false;
-  }
-
   private boolean jj_3R_71()
  {
     Token xsp;
@@ -3595,6 +3959,25 @@ private boolean jj_3R_71()
     return false;
   }
 
+  private boolean jj_3R_62()
+ {
+    if (jj_scan_token(OPEN_PARENTHESES)) return true;
+    if (jj_3R_13()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_41()
+ {
+    if (!jj_rescan) trace_call("UnaryExpression(LOOKING AHEAD...)");
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_62()) {
+    jj_scanpos = xsp;
+    if (jj_3R_63()) { if (!jj_rescan) trace_return("UnaryExpression(LOOKAHEAD FAILED)"); return true; }
+    }
+    { if (!jj_rescan) trace_return("UnaryExpression(LOOKAHEAD SUCCEEDED)"); return false; }
+  }
+
   private boolean jj_3_13()
  {
     Token xsp;
@@ -3628,19 +4011,21 @@ private boolean jj_3_24()
 
   private boolean jj_3R_15()
  {
-    if (jj_scan_token(ALPHANUMERIC)) return true;
-    if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    return false;
+    if (!jj_rescan) trace_call("ValueFunction(LOOKING AHEAD...)");
+    if (jj_scan_token(ALPHANUMERIC)) { if (!jj_rescan) trace_return("ValueFunction(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(OPEN_PARENTHESES)) { if (!jj_rescan) trace_return("ValueFunction(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("ValueFunction(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_48()
  {
-    if (jj_scan_token(INSERT)) return true;
-    if (jj_3R_70()) return true;
+    if (!jj_rescan) trace_call("InsertCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(INSERT)) { if (!jj_rescan) trace_return("InsertCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_70()) { if (!jj_rescan) trace_return("InsertCommand(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_71()) jj_scanpos = xsp;
-    return false;
+    { if (!jj_rescan) trace_return("InsertCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_112()
@@ -3651,36 +4036,41 @@ private boolean jj_3R_112()
 
   private boolean jj_3R_30()
  {
-    if (jj_3R_41()) return true;
-    return false;
+    if (!jj_rescan) trace_call("ConjunctionExpression(LOOKING AHEAD...)");
+    if (jj_3R_41()) { if (!jj_rescan) trace_return("ConjunctionExpression(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("ConjunctionExpression(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_77()
  {
-    if (jj_scan_token(DESCRIBE)) return true;
+    if (!jj_rescan) trace_call("DescribeCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(DESCRIBE)) { if (!jj_rescan) trace_return("DescribeCommand(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_24()) {
     jj_scanpos = xsp;
-    if (jj_3R_92()) return true;
+    if (jj_3R_92()) { if (!jj_rescan) trace_return("DescribeCommand(LOOKAHEAD FAILED)"); return true; }
     }
-    return false;
+    { if (!jj_rescan) trace_return("DescribeCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_13()
  {
-    if (jj_3R_30()) return true;
-    return false;
+    if (!jj_rescan) trace_call("DisjunctionExpression(LOOKING AHEAD...)");
+    if (jj_3R_30()) { if (!jj_rescan) trace_return("DisjunctionExpression(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("DisjunctionExpression(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_36()
  {
-    if (jj_3R_48()) return true;
-    return false;
+    if (!jj_rescan) trace_call("RecordOperations(LOOKING AHEAD...)");
+    if (jj_3R_48()) { if (!jj_rescan) trace_return("RecordOperations(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("RecordOperations(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_14()
  {
+    if (!jj_rescan) trace_call("KeyFunction(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(69)) {
@@ -3691,14 +4081,14 @@ private boolean jj_3R_14()
     jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) return true;
+    if (jj_scan_token(72)) { if (!jj_rescan) trace_return("KeyFunction(LOOKAHEAD FAILED)"); return true; }
     }
     }
     }
     }
-    if (jj_scan_token(PIPE)) return true;
-    if (jj_scan_token(ALPHANUMERIC)) return true;
-    return false;
+    if (jj_scan_token(PIPE)) { if (!jj_rescan) trace_return("KeyFunction(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(ALPHANUMERIC)) { if (!jj_rescan) trace_return("KeyFunction(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("KeyFunction(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_91()
@@ -3709,11 +4099,12 @@ private boolean jj_3R_91()
 
   private boolean jj_3R_69()
  {
-    if (jj_scan_token(VERIFY_OR_SET)) return true;
-    if (jj_3R_20()) return true;
-    if (jj_scan_token(AS)) return true;
-    if (jj_3R_85()) return true;
-    return false;
+    if (!jj_rescan) trace_call("VerifyOrSetCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(VERIFY_OR_SET)) { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_85()) { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3_23()
@@ -3722,6 +4113,12 @@ private boolean jj_3_23()
     return false;
   }
 
+  private boolean jj_3_12()
+ {
+    if (jj_3R_14()) return true;
+    return false;
+  }
+
   private boolean jj_3_4()
  {
     Token xsp;
@@ -3731,12 +4128,6 @@ private boolean jj_3_4()
     return false;
   }
 
-  private boolean jj_3_12()
- {
-    if (jj_3R_14()) return true;
-    return false;
-  }
-
   private boolean jj_3_22()
  {
     if (jj_3R_20()) return true;
@@ -3768,6 +4159,13 @@ private boolean jj_3R_111()
     return false;
   }
 
+  private boolean jj_3R_70()
+ {
+    if (!jj_rescan) trace_call("JsonObject(LOOKING AHEAD...)");
+    if (jj_scan_token(QUOTED_STRING)) { if (!jj_rescan) trace_return("JsonObject(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("JsonObject(LOOKAHEAD SUCCEEDED)"); return false; }
+  }
+
   private boolean jj_3_3()
  {
     if (jj_3R_12()) return true;
@@ -3775,33 +4173,37 @@ private boolean jj_3_3()
     return false;
   }
 
-  private boolean jj_3R_70()
+  private boolean jj_3R_68()
  {
-    if (jj_scan_token(QUOTED_STRING)) return true;
-    return false;
+    if (!jj_rescan) trace_call("VerifyAndSwapCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(VERIFY_AND_SWAP)) { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_85()) { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
-  private boolean jj_3R_68()
+  private boolean jj_3_21()
  {
-    if (jj_scan_token(VERIFY_AND_SWAP)) return true;
     if (jj_3R_20()) return true;
-    if (jj_scan_token(AS)) return true;
-    if (jj_3R_85()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
   private boolean jj_3R_106()
  {
+    if (!jj_rescan) trace_call("BinaryValue(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_10()) {
     jj_scanpos = xsp;
     if (jj_3R_111()) {
     jj_scanpos = xsp;
-    if (jj_3R_112()) return true;
+    if (jj_3R_112()) { if (!jj_rescan) trace_return("BinaryValue(LOOKAHEAD FAILED)"); return true; }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("BinaryValue(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3_10()
@@ -3810,14 +4212,6 @@ private boolean jj_3_10()
     return false;
   }
 
-  private boolean jj_3_21()
- {
-    if (jj_3R_20()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
-    return false;
-  }
-
   private boolean jj_3R_34()
  {
     if (jj_scan_token(COMMA)) return true;
@@ -3826,7 +4220,8 @@ private boolean jj_3R_34()
 
   private boolean jj_3R_76()
  {
-    if (jj_scan_token(GET)) return true;
+    if (!jj_rescan) trace_call("GetCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(GET)) { if (!jj_rescan) trace_return("GetCommand(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_21()) {
@@ -3835,23 +4230,30 @@ private boolean jj_3R_76()
     jj_scanpos = xsp;
     if (jj_3_23()) {
     jj_scanpos = xsp;
-    if (jj_3R_91()) return true;
+    if (jj_3R_91()) { if (!jj_rescan) trace_return("GetCommand(LOOKAHEAD FAILED)"); return true; }
     }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("GetCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_22()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
-    if (jj_3R_20()) return true;
+    if (!jj_rescan) trace_call("KeyCollection(LOOKING AHEAD...)");
+    if (jj_scan_token(OPEN_BRACKET)) { if (!jj_rescan) trace_return("KeyCollection(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("KeyCollection(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_3R_34()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(CLOSE_BRACKET)) return true;
+    if (jj_scan_token(CLOSE_BRACKET)) { if (!jj_rescan) trace_return("KeyCollection(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("KeyCollection(LOOKAHEAD SUCCEEDED)"); return false; }
+  }
+
+  private boolean jj_3R_87()
+ {
+    if (jj_3R_22()) return true;
     return false;
   }
 
@@ -3864,12 +4266,6 @@ private boolean jj_3_2()
     return false;
   }
 
-  private boolean jj_3R_87()
- {
-    if (jj_3R_22()) return true;
-    return false;
-  }
-
   private boolean jj_3R_110()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
@@ -3932,15 +4328,16 @@ private boolean jj_3_8()
 
   private boolean jj_3R_21()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
+    if (!jj_rescan) trace_call("RecordCollection(LOOKING AHEAD...)");
+    if (jj_scan_token(OPEN_BRACKET)) { if (!jj_rescan) trace_return("RecordCollection(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("RecordCollection(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_3R_107()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(CLOSE_BRACKET)) return true;
-    return false;
+    if (jj_scan_token(CLOSE_BRACKET)) { if (!jj_rescan) trace_return("RecordCollection(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("RecordCollection(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3_16()
@@ -4028,7 +4425,8 @@ private boolean jj_3R_61()
 
   private boolean jj_3R_67()
  {
-    if (jj_scan_token(CLEAR)) return true;
+    if (!jj_rescan) trace_call("ClearCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(CLEAR)) { if (!jj_rescan) trace_return("ClearCommand(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_15()) {
@@ -4037,11 +4435,11 @@ private boolean jj_3R_67()
     jj_scanpos = xsp;
     if (jj_3_17()) {
     jj_scanpos = xsp;
-    if (jj_3R_87()) return true;
+    if (jj_3R_87()) { if (!jj_rescan) trace_return("ClearCommand(LOOKAHEAD FAILED)"); return true; }
     }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("ClearCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3_18()
@@ -4066,21 +4464,23 @@ private boolean jj_3R_108()
 
   private boolean jj_3R_103()
  {
+    if (!jj_rescan) trace_call("RegexValue(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_108()) {
     jj_scanpos = xsp;
     if (jj_3R_109()) {
     jj_scanpos = xsp;
-    if (jj_3R_110()) return true;
+    if (jj_3R_110()) { if (!jj_rescan) trace_return("RegexValue(LOOKAHEAD FAILED)"); return true; }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("RegexValue(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_75()
  {
-    if (jj_scan_token(FETCH)) return true;
+    if (!jj_rescan) trace_call("FetchCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(FETCH)) { if (!jj_rescan) trace_return("FetchCommand(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_18()) {
@@ -4089,11 +4489,11 @@ private boolean jj_3R_75()
     jj_scanpos = xsp;
     if (jj_3_20()) {
     jj_scanpos = xsp;
-    if (jj_3R_90()) return true;
+    if (jj_3R_90()) { if (!jj_rescan) trace_return("FetchCommand(LOOKAHEAD FAILED)"); return true; }
     }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("FetchCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3_27()
@@ -4106,24 +4506,19 @@ private boolean jj_3_27()
 
   private boolean jj_3R_66()
  {
-    if (jj_scan_token(REMOVE)) return true;
-    if (jj_3R_20()) return true;
+    if (!jj_rescan) trace_call("RemoveCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(REMOVE)) { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_86()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(25)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(23)) return true;
+    if (jj_scan_token(23)) { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD FAILED)"); return true; }
     }
-    if (jj_scan_token(NUMERIC)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_101()
- {
-    if (jj_scan_token(NUMERIC)) return true;
-    return false;
+    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3_26()
@@ -4134,18 +4529,27 @@ private boolean jj_3_26()
     return false;
   }
 
+  private boolean jj_3R_101()
+ {
+    if (!jj_rescan) trace_call("LinksToValue(LOOKING AHEAD...)");
+    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("LinksToValue(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("LinksToValue(LOOKAHEAD SUCCEEDED)"); return false; }
+  }
+
   private boolean jj_3R_74()
  {
-    if (jj_scan_token(SELECT)) return true;
-    if (jj_3R_20()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
-    return false;
+    if (!jj_rescan) trace_call("SelectCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(SELECT)) { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(FROM)) { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_40()
  {
-    if (jj_scan_token(REVERT)) return true;
+    if (!jj_rescan) trace_call("RevertCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(REVERT)) { if (!jj_rescan) trace_return("RevertCommand(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_26()) {
@@ -4154,20 +4558,21 @@ private boolean jj_3R_40()
     jj_scanpos = xsp;
     if (jj_3_28()) {
     jj_scanpos = xsp;
-    if (jj_3R_61()) return true;
+    if (jj_3R_61()) { if (!jj_rescan) trace_return("RevertCommand(LOOKAHEAD FAILED)"); return true; }
     }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("RevertCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_65()
  {
-    if (jj_scan_token(SET)) return true;
-    if (jj_3R_20()) return true;
-    if (jj_scan_token(AS)) return true;
-    if (jj_3R_85()) return true;
-    return false;
+    if (!jj_rescan) trace_call("SetCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(SET)) { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_85()) { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_99()
@@ -4196,8 +4601,9 @@ private boolean jj_3R_55()
 
   private boolean jj_3R_83()
  {
-    if (jj_scan_token(ABORT)) return true;
-    return false;
+    if (!jj_rescan) trace_call("AbortCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(ABORT)) { if (!jj_rescan) trace_return("AbortCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("AbortCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_54()
@@ -4208,11 +4614,12 @@ private boolean jj_3R_54()
 
   private boolean jj_3R_64()
  {
-    if (jj_scan_token(ADD)) return true;
-    if (jj_3R_20()) return true;
-    if (jj_scan_token(AS)) return true;
-    if (jj_3R_85()) return true;
-    return false;
+    if (!jj_rescan) trace_call("AddCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(ADD)) { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_20()) { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_85()) { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_53()
@@ -4229,6 +4636,7 @@ private boolean jj_3R_52()
 
   private boolean jj_3R_38()
  {
+    if (!jj_rescan) trace_call("QueryOperations(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3R_51()) {
@@ -4243,14 +4651,14 @@ private boolean jj_3R_38()
     jj_scanpos = xsp;
     if (jj_3R_56()) {
     jj_scanpos = xsp;
-    if (jj_3R_57()) return true;
+    if (jj_3R_57()) { if (!jj_rescan) trace_return("QueryOperations(LOOKAHEAD FAILED)"); return true; }
     }
     }
     }
     }
     }
     }
-    return false;
+    { if (!jj_rescan) trace_return("QueryOperations(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_51()
@@ -4261,8 +4669,9 @@ private boolean jj_3R_51()
 
   private boolean jj_3R_82()
  {
-    if (jj_scan_token(COMMIT)) return true;
-    return false;
+    if (!jj_rescan) trace_call("CommitCommand(LOOKING AHEAD...)");
+    if (jj_scan_token(COMMIT)) { if (!jj_rescan) trace_return("CommitCommand(LOOKAHEAD FAILED)"); return true; }
+    { if (!jj_rescan) trace_return("CommitCommand(LOOKAHEAD SUCCEEDED)"); return false; }
   }
 
   private boolean jj_3R_63()
@@ -4271,6 +4680,12 @@ private boolean jj_3R_63()
     return false;
   }
 
+  private boolean jj_3R_47()
+ {
+    if (jj_3R_69()) return true;
+    return false;
+  }
+
   /** Generated Token Manager. */
   public GrammarTokenManager token_source;
   SimpleCharStream jj_input_stream;
@@ -4282,7 +4697,7 @@ private boolean jj_3R_63()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[84];
+  final private int[] jj_la1 = new int[85];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -4292,18 +4707,21 @@ private boolean jj_3R_63()
 	   jj_la1_init_2();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x8000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x380000,0x0,0x0,0x0,};
+	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x8000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x800000,0x800000,0x0,0x0,0x800000,0x380000,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x40,0x10000000,0xc000000,0x1c000000,0x40,0x10000000,0xc000000,0x1c000000,0x200,0x100,0x82,0x20,0x20,0x20,0x20,0x1f03c00,0x80,0x80,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x1e00000,0x3400,0x0,0x8000000,0x4000000,0xc000000,0x0,0x60000000,0x3080,0x20,0x3000,0x60000000,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x20,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x8,0x0,0x20,0x0,0x8,0x0,0x0,};
+	   jj_la1_1 = new int[] {0x40,0x10000000,0xc000000,0x1c000000,0x40,0x10000000,0xc000000,0x1c000000,0x200,0x100,0x82,0x20,0x20,0x20,0x20,0x1f03c00,0x80,0x80,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x1e00000,0x3400,0x20,0x0,0x8000000,0x4000000,0xc000000,0x0,0x60000000,0x3080,0x20,0x3000,0x60000000,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x20,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x8,0x0,0x20,0x0,0x8,0x0,0x0,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x1e8,0x0,0x0,0x0,0x1e8,0x0,0x0,0x1e8,0x0,0x0,0x0,0x0,0x0,0xe8,0x1e8,0x3e8,0x3e9,0x183e8,0x183e8,0x183e9,0x3e8,0x3e9,0x0,0x0,0x2e9,0x0,0x0,0x0,0x10,0x0,0x1e8,0x0,0x0,0x0,0x80,0x1e8,0x1e0,0x10,0x1e0,0x28,0x10,0x28,0x28,0x10,0x28,0x28,0x1e0,0x10,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x10,0x10,};
+	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x1e8,0x0,0x0,0x0,0x1e8,0x0,0x0,0x1e8,0x0,0x0,0x0,0x0,0x0,0xe8,0x1e8,0x3e8,0x3e9,0x183e8,0x183e8,0x183e9,0x3e8,0x3e9,0x0,0x0,0x0,0x2e9,0x0,0x0,0x0,0x10,0x0,0x1e8,0x0,0x0,0x0,0x80,0x1e8,0x1e0,0x10,0x1e0,0x28,0x10,0x28,0x28,0x10,0x28,0x28,0x1e0,0x10,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x10,0x10,};
 	}
   final private JJCalls[] jj_2_rtns = new JJCalls[28];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
+  {
+      enable_tracing();
+  }
   /** Constructor with InputStream. */
   public Grammar(java.io.InputStream stream) {
 	  this(stream, null);
@@ -4315,7 +4733,7 @@ public Grammar(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4331,7 +4749,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4342,7 +4760,7 @@ public Grammar(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4362,7 +4780,7 @@ public void ReInit(java.io.Reader stream) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4372,7 +4790,7 @@ public Grammar(GrammarTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4383,7 +4801,7 @@ public void ReInit(GrammarTokenManager tm) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 84; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4404,6 +4822,7 @@ private Token jj_consume_token(int kind) throws ParseException {
 		   }
 		 }
 	   }
+	   trace_token(token, "");
 	   return token;
 	 }
 	 token = oldToken;
@@ -4429,6 +4848,8 @@ private boolean jj_scan_token(int kind) {
 	   int i = 0; Token tok = token;
 	   while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
 	   if (tok != null) jj_add_error_token(kind, i);
+	 } else {
+	   trace_scan(jj_scanpos, kind);
 	 }
 	 if (jj_scanpos.kind != kind) return true;
 	 if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
@@ -4442,6 +4863,7 @@ final public Token getNextToken() {
 	 else token = token.next = token_source.getNextToken();
 	 jj_ntk = -1;
 	 jj_gen++;
+	   trace_token(token, " (in getNextToken)");
 	 return token;
   }
 
@@ -4514,7 +4936,7 @@ public ParseException generateParseException() {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 84; i++) {
+	 for (int i = 0; i < 85; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4554,12 +4976,52 @@ final public boolean trace_enabled() {
 	 return trace_enabled;
   }
 
-  /** Enable tracing. */
+/** Enable tracing. */
   final public void enable_tracing() {
+	 trace_enabled = true;
   }
 
-  /** Disable tracing. */
+/** Disable tracing. */
   final public void disable_tracing() {
+	 trace_enabled = false;
+  }
+
+  protected void trace_call(String s) {
+	 if (trace_enabled) {
+	   for (int i = 0; i < trace_indent; i++) { System.out.print(" "); }
+	   System.out.println("Call:	" + s);
+	 }
+	 trace_indent = trace_indent + 2;
+  }
+
+  protected void trace_return(String s) {
+	 trace_indent = trace_indent - 2;
+	 if (trace_enabled) {
+	   for (int i = 0; i < trace_indent; i++) { System.out.print(" "); }
+	   System.out.println("Return: " + s);
+	 }
+  }
+
+  protected void trace_token(Token t, String where) {
+	 if (trace_enabled) {
+	   for (int i = 0; i < trace_indent; i++) { System.out.print(" "); }
+	   System.out.print("Consumed token: <" + tokenImage[t.kind]);
+	   if (t.kind != 0 && !tokenImage[t.kind].equals("\"" + t.image + "\"")) {
+		 System.out.print(": \"" + TokenMgrError.addEscapes(t.image) + "\"");
+	   }
+	   System.out.println(" at line " + t.beginLine + " column " + t.beginColumn + ">" + where);
+	 }
+  }
+
+  protected void trace_scan(Token t1, int t2) {
+	 if (trace_enabled) {
+	   for (int i = 0; i < trace_indent; i++) { System.out.print(" "); }
+	   System.out.print("Visited token: <" + tokenImage[t1.kind]);
+	   if (t1.kind != 0 && !tokenImage[t1.kind].equals("\"" + t1.image + "\"")) {
+		 System.out.print(": \"" + TokenMgrError.addEscapes(t1.image) + "\"");
+	   }
+	   System.out.println(" at line " + t1.beginLine + " column " + t1.beginColumn + ">; Expected token: <" + tokenImage[t2] + ">");
+	 }
   }
 
   private void jj_rescan_token() {
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
index fef8f3bb..577de0c6 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
@@ -865,7 +865,7 @@ private int jjMoveNfa_0(int startState, int curPos)
    catch(java.io.IOException e) { throw new Error("Internal Error"); }
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 265;
+   jjnewStateCnt = 264;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -885,7 +885,7 @@ private int jjMoveNfa_0(int startState, int curPos)
                   {
                      if (kind > 73)
                         kind = 73;
-                     { jjCheckNAddTwoStates(20, 21); }
+                     { jjCheckNAddTwoStates(18, 19); }
                   }
                   else if (curChar == 61)
                   {
@@ -905,13 +905,13 @@ else if (curChar == 39)
                   else if (curChar == 34)
                      { jjCheckNAddStates(12, 15); }
                   else if (curChar == 62)
-                     { jjCheckNAddTwoStates(13, 83); }
+                     { jjCheckNAddTwoStates(11, 82); }
                   else if (curChar == 60)
-                     { jjCheckNAdd(13); }
+                     { jjCheckNAdd(11); }
                   else if (curChar == 33)
-                     { jjCheckNAdd(13); }
+                     { jjCheckNAdd(11); }
                   else if (curChar == 61)
-                     { jjCheckNAdd(13); }
+                     { jjCheckNAdd(11); }
                   else if (curChar == 38)
                   {
                      if (kind > 40)
@@ -924,259 +924,259 @@ else if (curChar == 38)
                      { jjCheckNAddStates(16, 21); }
                   }
                   else if (curChar == 45)
-                     jjstateSet[jjnewStateCnt++] = 18;
+                     jjstateSet[jjnewStateCnt++] = 16;
                   else if (curChar == 38)
-                     jjstateSet[jjnewStateCnt++] = 8;
+                     jjstateSet[jjnewStateCnt++] = 6;
                   break;
-               case 8:
+               case 6:
                   if (curChar == 38 && kind > 40)
                      kind = 40;
                   break;
-               case 9:
+               case 7:
                   if (curChar == 38)
-                     jjstateSet[jjnewStateCnt++] = 8;
+                     jjstateSet[jjnewStateCnt++] = 6;
                   break;
-               case 10:
+               case 8:
                   if (curChar == 38 && kind > 40)
                      kind = 40;
                   break;
-               case 13:
+               case 11:
                   if (curChar == 61 && kind > 42)
                      kind = 42;
                   break;
-               case 14:
+               case 12:
                   if (curChar == 61)
-                     { jjCheckNAdd(13); }
+                     { jjCheckNAdd(11); }
                   break;
-               case 15:
+               case 13:
                   if (curChar == 61 && kind > 42)
                      kind = 42;
                   break;
-               case 16:
+               case 14:
                   if (curChar == 33)
-                     { jjCheckNAdd(13); }
+                     { jjCheckNAdd(11); }
                   break;
-               case 17:
+               case 15:
                   if (curChar == 60)
-                     { jjCheckNAdd(13); }
+                     { jjCheckNAdd(11); }
                   break;
-               case 18:
+               case 16:
                   if (curChar == 62 && kind > 52)
                      kind = 52;
                   break;
-               case 19:
+               case 17:
                   if (curChar == 45)
-                     jjstateSet[jjnewStateCnt++] = 18;
+                     jjstateSet[jjnewStateCnt++] = 16;
                   break;
-               case 20:
+               case 18:
                   if ((0xdfffecfeffffd9ffL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(20, 21); }
+                  { jjCheckNAddTwoStates(18, 19); }
                   break;
-               case 21:
+               case 19:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(20, 21); }
+                  { jjCheckNAddTwoStates(18, 19); }
                   break;
-               case 78:
+               case 77:
                   if (curChar == 32)
-                     jjstateSet[jjnewStateCnt++] = 77;
+                     jjstateSet[jjnewStateCnt++] = 76;
                   break;
-               case 82:
+               case 81:
                   if (curChar == 62)
-                     { jjCheckNAddTwoStates(13, 83); }
+                     { jjCheckNAddTwoStates(11, 82); }
                   break;
-               case 83:
+               case 82:
                   if (curChar == 60 && kind > 43)
                      kind = 43;
                   break;
+               case 85:
                case 86:
-               case 87:
                   { jjCheckNAddStates(22, 24); }
                   break;
+               case 89:
                case 90:
-               case 91:
                   { jjCheckNAddStates(25, 27); }
                   break;
-               case 93:
+               case 92:
                   if (curChar == 34)
                      { jjCheckNAddStates(12, 15); }
                   break;
-               case 95:
+               case 94:
                   { jjCheckNAddStates(28, 30); }
                   break;
-               case 96:
+               case 95:
                   if ((0xfffffffbffffffffL & l) != 0L)
                      { jjCheckNAddStates(28, 30); }
                   break;
-               case 97:
+               case 96:
                   if (curChar == 34 && kind > 64)
                      kind = 64;
                   break;
-               case 99:
+               case 98:
                   { jjCheckNAddStates(31, 33); }
                   break;
-               case 100:
+               case 99:
                   if ((0xfffffffbffffffffL & l) != 0L)
                      { jjCheckNAddStates(31, 33); }
                   break;
-               case 101:
+               case 100:
                   if (curChar == 34 && kind > 65)
                      kind = 65;
                   break;
+               case 103:
                case 104:
-               case 105:
                   { jjCheckNAddStates(34, 36); }
                   break;
+               case 107:
                case 108:
-               case 109:
                   { jjCheckNAddStates(37, 39); }
                   break;
+               case 112:
                case 113:
-               case 114:
                   { jjCheckNAddStates(40, 42); }
                   break;
+               case 116:
                case 117:
-               case 118:
                   { jjCheckNAddStates(43, 45); }
                   break;
-               case 120:
+               case 119:
                   if (curChar == 39)
                      { jjCheckNAddStates(8, 11); }
                   break;
-               case 122:
+               case 121:
                   { jjCheckNAddStates(46, 48); }
                   break;
-               case 123:
+               case 122:
                   if ((0xffffff7fffffffffL & l) != 0L)
                      { jjCheckNAddStates(46, 48); }
                   break;
-               case 124:
+               case 123:
                   if (curChar == 39 && kind > 64)
                      kind = 64;
                   break;
-               case 126:
+               case 125:
                   { jjCheckNAddStates(49, 51); }
                   break;
-               case 127:
+               case 126:
                   if ((0xffffff7fffffffffL & l) != 0L)
                      { jjCheckNAddStates(49, 51); }
                   break;
-               case 128:
+               case 127:
                   if (curChar == 39 && kind > 66)
                      kind = 66;
                   break;
-               case 129:
+               case 128:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 67)
                      kind = 67;
                   { jjCheckNAddStates(16, 21); }
                   break;
-               case 130:
+               case 129:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 67)
                      kind = 67;
-                  { jjCheckNAdd(130); }
+                  { jjCheckNAdd(129); }
                   break;
-               case 131:
+               case 130:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 69)
                      kind = 69;
-                  { jjCheckNAdd(131); }
+                  { jjCheckNAdd(130); }
                   break;
-               case 132:
+               case 131:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(132, 133); }
+                     { jjCheckNAddTwoStates(131, 132); }
                   break;
-               case 133:
+               case 132:
                   if (curChar == 46)
-                     { jjCheckNAdd(134); }
+                     { jjCheckNAdd(133); }
                   break;
-               case 134:
+               case 133:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 70)
                      kind = 70;
-                  { jjCheckNAdd(134); }
+                  { jjCheckNAdd(133); }
                   break;
-               case 135:
+               case 134:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(135, 136); }
+                     { jjCheckNAddTwoStates(134, 135); }
                   break;
-               case 136:
+               case 135:
                   if (curChar == 46)
-                     { jjCheckNAdd(137); }
+                     { jjCheckNAdd(136); }
                   break;
-               case 137:
+               case 136:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 72)
                      kind = 72;
-                  { jjCheckNAddTwoStates(137, 138); }
+                  { jjCheckNAddTwoStates(136, 137); }
                   break;
-               case 138:
+               case 137:
                   if (curChar == 46)
                      { jjCheckNAddStates(52, 54); }
                   break;
-               case 139:
+               case 138:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(140); }
+                     { jjCheckNAdd(139); }
                   break;
-               case 140:
+               case 139:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(140, 141); }
+                     { jjCheckNAddTwoStates(139, 140); }
                   break;
-               case 141:
+               case 140:
                   if (curChar == 46)
-                     { jjCheckNAdd(142); }
+                     { jjCheckNAdd(141); }
                   break;
-               case 142:
+               case 141:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 72)
                      kind = 72;
-                  { jjCheckNAddTwoStates(138, 142); }
+                  { jjCheckNAddTwoStates(137, 141); }
                   break;
-               case 143:
+               case 142:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 72)
                      kind = 72;
-                  { jjCheckNAddTwoStates(138, 143); }
+                  { jjCheckNAddTwoStates(137, 142); }
                   break;
-               case 144:
+               case 143:
                   if ((0x280000000000L & l) != 0L)
                      { jjCheckNAddStates(5, 7); }
                   break;
-               case 145:
+               case 144:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 71)
                      kind = 71;
                   { jjCheckNAddStates(0, 4); }
                   break;
-               case 146:
+               case 145:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 71)
                      kind = 71;
-                  { jjCheckNAdd(146); }
+                  { jjCheckNAdd(145); }
                   break;
-               case 147:
+               case 146:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
                   if (kind > 72)
                      kind = 72;
-                  { jjCheckNAddTwoStates(147, 138); }
+                  { jjCheckNAddTwoStates(146, 137); }
                   break;
-               case 205:
+               case 204:
                   if (curChar == 50 && kind > 52)
                      kind = 52;
                   break;
@@ -1202,7 +1202,7 @@ else if ((0xf800000150000001L & l) != 0L)
                   {
                      if (kind > 73)
                         kind = 73;
-                     { jjCheckNAddTwoStates(20, 21); }
+                     { jjCheckNAddTwoStates(18, 19); }
                   }
                   if ((0x40000000400000L & l) != 0L)
                      { jjAddStates(55, 58); }
@@ -1213,21 +1213,19 @@ else if ((0x400000004000L & l) != 0L)
                   else if ((0x200000002L & l) != 0L)
                      { jjAddStates(72, 74); }
                   else if ((0x800000008000L & l) != 0L)
-                     { jjCheckNAddTwoStates(6, 73); }
+                     { jjAddStates(75, 76); }
                   else if ((0x8000000080L & l) != 0L)
-                     { jjCheckNAddStates(75, 78); }
+                     { jjCheckNAddStates(77, 80); }
                   else if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(79, 80); }
-                  else if ((0x400000004L & l) != 0L)
                      { jjAddStates(81, 82); }
-                  else if ((0x20000000200L & l) != 0L)
-                     { jjCheckNAdd(6); }
+                  else if ((0x400000004L & l) != 0L)
+                     { jjAddStates(83, 84); }
                   else if ((0x1000000010L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 4;
                   else if (curChar == 96)
-                     { jjCheckNAddStates(83, 86); }
+                     { jjCheckNAddStates(85, 88); }
                   else if (curChar == 124)
-                     jjstateSet[jjnewStateCnt++] = 11;
+                     jjstateSet[jjnewStateCnt++] = 9;
                   break;
                case 0:
                   if ((0x8000000080L & l) != 0L && kind > 37)
@@ -1249,551 +1247,551 @@ else if (curChar == 124)
                   if ((0x20000000200000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 3;
                   break;
-               case 6:
-                  if ((0x400000004000L & l) != 0L && kind > 37)
-                     kind = 37;
-                  break;
-               case 7:
-                  if ((0x20000000200L & l) != 0L)
-                     { jjCheckNAdd(6); }
-                  break;
-               case 11:
+               case 9:
                   if (curChar == 124 && kind > 41)
                      kind = 41;
                   break;
-               case 12:
+               case 10:
                   if (curChar == 124)
-                     jjstateSet[jjnewStateCnt++] = 11;
+                     jjstateSet[jjnewStateCnt++] = 9;
                   break;
-               case 20:
+               case 18:
                   if ((0xf800000150000001L & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(20, 21); }
+                  { jjCheckNAddTwoStates(18, 19); }
                   break;
-               case 21:
+               case 19:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(20, 21); }
+                  { jjCheckNAddTwoStates(18, 19); }
                   break;
-               case 22:
+               case 20:
                   if ((0x400000004L & l) != 0L)
-                     { jjAddStates(81, 82); }
+                     { jjAddStates(83, 84); }
                   break;
-               case 23:
+               case 21:
                   if ((0x80000000800000L & l) != 0L && kind > 43)
                      kind = 43;
                   break;
-               case 24:
+               case 22:
                   if ((0x400000004000L & l) != 0L && kind > 43)
                      kind = 43;
                   break;
-               case 25:
+               case 23:
                   if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 22;
+                  break;
+               case 24:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 23;
+                  break;
+               case 25:
+                  if ((0x80000000800000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 24;
                   break;
                case 26:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 25;
                   break;
                case 27:
-                  if ((0x80000000800000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 26;
                   break;
                case 28:
-                  if ((0x10000000100000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 27;
+                  if ((0x2000000020L & l) != 0L)
+                     { jjAddStates(81, 82); }
                   break;
                case 29:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 28;
+                  if ((0x8000000080000L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 30:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(79, 80); }
+               case 48:
+               case 148:
+               case 186:
+                  if ((0x100000001000L & l) != 0L)
+                     { jjCheckNAdd(29); }
                   break;
                case 31:
-                  if ((0x8000000080000L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 30;
                   break;
                case 32:
-               case 50:
-               case 149:
-               case 187:
-                  if ((0x100000001000L & l) != 0L)
-                     { jjCheckNAdd(31); }
+                  if ((0x20000000200000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 31;
                   break;
                case 33:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x2000000020000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 32;
                   break;
                case 34:
-                  if ((0x20000000200000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 33;
+                  if ((0x2000000020000L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 35:
-                  if ((0x2000000020000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 34;
+                  if ((0x8000000080L & l) != 0L)
+                     { jjCheckNAddStates(77, 80); }
                   break;
                case 36:
-                  if ((0x2000000020000L & l) != 0L && kind > 42)
+                  if ((0x400000004000L & l) != 0L && kind > 42)
                      kind = 42;
                   break;
                case 37:
-                  if ((0x8000000080L & l) != 0L)
-                     { jjCheckNAddStates(75, 78); }
+               case 179:
+                  if ((0x200000002L & l) != 0L)
+                     { jjCheckNAdd(36); }
                   break;
                case 38:
-                  if ((0x400000004000L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x10000000100L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 37;
                   break;
                case 39:
-               case 180:
-                  if ((0x200000002L & l) != 0L)
-                     { jjCheckNAdd(38); }
+                  if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 38;
                   break;
                case 40:
-                  if ((0x10000000100L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 39;
                   break;
                case 41:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 40;
                   break;
                case 42:
-                  if (curChar == 95)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 41;
                   break;
                case 43:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 42;
                   break;
                case 44:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 43;
                   break;
                case 45:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 44;
                   break;
                case 46:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 45;
                   break;
                case 47:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 46;
-                  break;
-               case 48:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 47;
-                  break;
-               case 49:
                   if ((0x10000000100000L & l) != 0L && kind > 42)
                      kind = 42;
                   break;
-               case 51:
+               case 49:
                   if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 48;
+                  break;
+               case 50:
+                  if ((0x20000000200000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 49;
+                  break;
+               case 51:
+                  if ((0x2000000020000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 50;
                   break;
                case 52:
-                  if ((0x20000000200000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 51;
                   break;
                case 53:
-                  if ((0x2000000020000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 52;
                   break;
                case 54:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 53;
                   break;
                case 55:
-                  if (curChar == 95)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 54;
                   break;
                case 56:
-                  if ((0x4000000040000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 55;
                   break;
                case 57:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 56;
                   break;
                case 58:
-                  if (curChar == 95)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 57;
                   break;
                case 59:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x10000000100L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 58;
                   break;
                case 60:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 59;
                   break;
                case 61:
-                  if ((0x10000000100L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 60;
                   break;
                case 62:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 61;
                   break;
                case 63:
-                  if (curChar == 95)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 62;
                   break;
                case 64:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 63;
                   break;
                case 65:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 64;
                   break;
                case 66:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 65;
                   break;
                case 67:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 66;
                   break;
                case 68:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 67;
+                  if ((0x2000000020L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 69:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 68;
+               case 203:
+                  if ((0x10000000100000L & l) != 0L)
+                     { jjCheckNAdd(68); }
                   break;
                case 70:
-                  if ((0x2000000020L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x800000008000L & l) != 0L)
+                     { jjAddStates(75, 76); }
                   break;
                case 71:
-               case 204:
-                  if ((0x10000000100000L & l) != 0L)
-                     { jjCheckNAdd(70); }
+                  if ((0x400000004000L & l) != 0L && kind > 37)
+                     kind = 37;
                   break;
                case 72:
-                  if ((0x800000008000L & l) != 0L)
-                     { jjCheckNAddTwoStates(6, 73); }
-                  break;
-               case 73:
                   if ((0x4000000040000L & l) != 0L && kind > 41)
                      kind = 41;
                   break;
-               case 74:
+               case 73:
                   if ((0x200000002L & l) != 0L)
                      { jjAddStates(72, 74); }
                   break;
-               case 75:
+               case 74:
                   if ((0x10000000100000L & l) != 0L && kind > 37)
                      kind = 37;
                   break;
-               case 76:
+               case 75:
                   if ((0x4000000040L & l) != 0L && kind > 37)
                      kind = 37;
                   break;
-               case 77:
+               case 76:
                   if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 76;
+                     jjstateSet[jjnewStateCnt++] = 75;
                   break;
-               case 79:
+               case 78:
                   if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 78;
+                     jjstateSet[jjnewStateCnt++] = 77;
                   break;
-               case 80:
+               case 79:
                   if ((0x1000000010L & l) != 0L && kind > 40)
                      kind = 40;
                   break;
-               case 81:
+               case 80:
                   if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 80;
+                     jjstateSet[jjnewStateCnt++] = 79;
                   break;
-               case 85:
+               case 84:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 86;
+                     jjstateSet[jjnewStateCnt++] = 85;
                   break;
-               case 86:
+               case 85:
                   { jjCheckNAddStates(22, 24); }
                   break;
-               case 87:
+               case 86:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(22, 24); }
                   break;
-               case 89:
+               case 88:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 90;
+                     jjstateSet[jjnewStateCnt++] = 89;
                   break;
-               case 90:
+               case 89:
                   { jjCheckNAddStates(25, 27); }
                   break;
-               case 91:
+               case 90:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(25, 27); }
                   break;
-               case 94:
+               case 93:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 95;
+                     jjstateSet[jjnewStateCnt++] = 94;
                   break;
-               case 95:
+               case 94:
                   { jjCheckNAddStates(28, 30); }
                   break;
-               case 96:
+               case 95:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(28, 30); }
                   break;
-               case 98:
+               case 97:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 99;
+                     jjstateSet[jjnewStateCnt++] = 98;
                   break;
-               case 99:
+               case 98:
                   { jjCheckNAddStates(31, 33); }
                   break;
-               case 100:
+               case 99:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(31, 33); }
                   break;
-               case 102:
+               case 101:
                   if (curChar == 96)
-                     { jjCheckNAddStates(83, 86); }
+                     { jjCheckNAddStates(85, 88); }
                   break;
-               case 103:
+               case 102:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 104;
+                     jjstateSet[jjnewStateCnt++] = 103;
                   break;
-               case 104:
+               case 103:
                   { jjCheckNAddStates(34, 36); }
                   break;
-               case 105:
+               case 104:
                   if ((0xfffffffeefffffffL & l) != 0L)
                      { jjCheckNAddStates(34, 36); }
                   break;
-               case 106:
+               case 105:
                   if (curChar == 96 && kind > 64)
                      kind = 64;
                   break;
-               case 107:
+               case 106:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 108;
+                     jjstateSet[jjnewStateCnt++] = 107;
                   break;
-               case 108:
+               case 107:
                   { jjCheckNAddStates(37, 39); }
                   break;
-               case 109:
+               case 108:
                   if ((0xfffffffeefffffffL & l) != 0L)
                      { jjCheckNAddStates(37, 39); }
                   break;
-               case 110:
+               case 109:
                   if (curChar == 96 && kind > 66)
                      kind = 66;
                   break;
-               case 112:
+               case 111:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 113;
+                     jjstateSet[jjnewStateCnt++] = 112;
                   break;
-               case 113:
+               case 112:
                   { jjCheckNAddStates(40, 42); }
                   break;
-               case 114:
+               case 113:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(40, 42); }
                   break;
-               case 116:
+               case 115:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 117;
+                     jjstateSet[jjnewStateCnt++] = 116;
                   break;
-               case 117:
+               case 116:
                   { jjCheckNAddStates(43, 45); }
                   break;
-               case 118:
+               case 117:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(43, 45); }
                   break;
-               case 121:
+               case 120:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 122;
+                     jjstateSet[jjnewStateCnt++] = 121;
                   break;
-               case 122:
+               case 121:
                   { jjCheckNAddStates(46, 48); }
                   break;
-               case 123:
+               case 122:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(46, 48); }
                   break;
-               case 125:
+               case 124:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 126;
+                     jjstateSet[jjnewStateCnt++] = 125;
                   break;
-               case 126:
+               case 125:
                   { jjCheckNAddStates(49, 51); }
                   break;
-               case 127:
+               case 126:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(49, 51); }
                   break;
-               case 143:
+               case 142:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 72)
                      kind = 72;
-                  { jjCheckNAddTwoStates(138, 143); }
+                  { jjCheckNAddTwoStates(137, 142); }
                   break;
-               case 145:
+               case 144:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 71)
                      kind = 71;
                   { jjCheckNAddStates(0, 4); }
                   break;
-               case 146:
+               case 145:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 71)
                      kind = 71;
-                  { jjCheckNAdd(146); }
+                  { jjCheckNAdd(145); }
                   break;
-               case 147:
+               case 146:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
                   if (kind > 72)
                      kind = 72;
-                  { jjCheckNAddTwoStates(147, 138); }
+                  { jjCheckNAddTwoStates(146, 137); }
                   break;
-               case 148:
+               case 147:
                   if ((0x400000004000L & l) != 0L)
                      { jjCheckNAddStates(66, 71); }
                   break;
-               case 150:
+               case 149:
                   if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 148;
+                  break;
+               case 150:
+                  if ((0x20000000200000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 149;
                   break;
                case 151:
-                  if ((0x20000000200000L & l) != 0L)
+                  if ((0x2000000020000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 150;
                   break;
                case 152:
-                  if ((0x2000000020000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 151;
                   break;
                case 153:
-                  if ((0x2000000020L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 152;
                   break;
                case 154:
-                  if (curChar == 95)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 153;
                   break;
                case 155:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 154;
                   break;
                case 156:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 155;
-                  break;
-               case 157:
                   if ((0x100000001000000L & l) != 0L && kind > 54)
                      kind = 54;
                   break;
-               case 158:
-               case 162:
+               case 157:
+               case 161:
                   if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAdd(157); }
+                     { jjCheckNAdd(156); }
                   break;
-               case 159:
+               case 158:
                   if ((0x8000000080L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 157;
+                  break;
+               case 159:
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 158;
                   break;
                case 160:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 159;
                   break;
-               case 161:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 160;
+               case 162:
+                  if ((0x8000000080L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 161;
                   break;
                case 163:
-                  if ((0x8000000080L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 162;
                   break;
                case 164:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 163;
                   break;
                case 165:
-                  if ((0x4000000040000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 164;
                   break;
                case 166:
-                  if (curChar == 95)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 165;
                   break;
                case 167:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 166;
                   break;
                case 168:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 167;
-                  break;
-               case 169:
                   if ((0x2000000020L & l) != 0L && kind > 56)
                      kind = 56;
                   break;
-               case 170:
-               case 173:
+               case 169:
+               case 172:
                   if ((0x80000000800L & l) != 0L)
-                     { jjCheckNAdd(169); }
+                     { jjCheckNAdd(168); }
                   break;
-               case 171:
+               case 170:
                   if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 170;
+                     jjstateSet[jjnewStateCnt++] = 169;
                   break;
-               case 172:
+               case 171:
                   if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 171;
+                     jjstateSet[jjnewStateCnt++] = 170;
                   break;
-               case 174:
+               case 173:
                   if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 172;
+                  break;
+               case 174:
+                  if ((0x100000001000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 173;
                   break;
                case 175:
-                  if ((0x100000001000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 174;
                   break;
                case 176:
-                  if (curChar == 95)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 175;
                   break;
                case 177:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 176;
                   break;
                case 178:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 177;
-                  break;
-               case 179:
                   if ((0x100000001000L & l) != 0L)
                      { jjCheckNAddStates(59, 65); }
                   break;
-               case 181:
+               case 180:
                   if ((0x10000000100L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 179;
+                  break;
+               case 181:
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 180;
                   break;
                case 182:
-                  if ((0x10000000100000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 181;
                   break;
                case 183:
-                  if (curChar == 95)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 182;
                   break;
                case 184:
@@ -1801,63 +1799,63 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 183;
                   break;
                case 185:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 184;
                   break;
-               case 186:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 185;
+               case 187:
+                  if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 186;
                   break;
                case 188:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x20000000200000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 187;
                   break;
                case 189:
-                  if ((0x20000000200000L & l) != 0L)
+                  if ((0x2000000020000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 188;
                   break;
                case 190:
-                  if ((0x2000000020000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 189;
                   break;
                case 191:
-                  if ((0x2000000020L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 190;
                   break;
                case 192:
-                  if (curChar == 95)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 191;
                   break;
                case 193:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 192;
                   break;
                case 194:
-                  if ((0x800000008000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 193;
                   break;
                case 195:
-                  if (curChar == 95)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 194;
                   break;
                case 196:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 195;
                   break;
                case 197:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x10000000100L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 196;
                   break;
                case 198:
-                  if ((0x10000000100L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 197;
                   break;
                case 199:
-                  if ((0x10000000100000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 198;
                   break;
                case 200:
-                  if (curChar == 95)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 199;
                   break;
                case 201:
@@ -1865,242 +1863,238 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 200;
                   break;
                case 202:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 201;
                   break;
-               case 203:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 202;
+               case 205:
+                  if ((0x8000000080000L & l) != 0L)
+                     { jjCheckNAdd(204); }
                   break;
                case 206:
-                  if ((0x8000000080000L & l) != 0L)
-                     { jjCheckNAdd(205); }
+                  if ((0x80000000800L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 205;
                   break;
                case 207:
-                  if ((0x80000000800L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 206;
                   break;
                case 208:
-                  if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 207;
-                  break;
-               case 209:
                   if ((0x80000000800L & l) != 0L)
-                     { jjCheckNAdd(205); }
+                     { jjCheckNAdd(204); }
                   break;
-               case 210:
+               case 209:
                   if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 209;
+                     jjstateSet[jjnewStateCnt++] = 208;
                   break;
-               case 211:
+               case 210:
                   if ((0x800000008000L & l) != 0L && kind > 52)
                      kind = 52;
                   break;
-               case 212:
+               case 211:
                   if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 210;
+                  break;
+               case 212:
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 211;
                   break;
                case 213:
-                  if (curChar == 95)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 212;
                   break;
                case 214:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x80000000800L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 213;
                   break;
                case 215:
-                  if ((0x80000000800L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 214;
                   break;
                case 216:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 215;
                   break;
                case 217:
-                  if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 216;
-                  break;
-               case 218:
                   if ((0x40000000400000L & l) != 0L)
                      { jjAddStates(55, 58); }
                   break;
-               case 219:
+               case 218:
                   if ((0x1000000010000L & l) != 0L && kind > 7)
                      kind = 7;
                   break;
-               case 220:
-               case 231:
+               case 219:
+               case 230:
                   if ((0x200000002L & l) != 0L)
-                     { jjCheckNAdd(219); }
+                     { jjCheckNAdd(218); }
                   break;
-               case 221:
+               case 220:
                   if ((0x80000000800000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 219;
+                  break;
+               case 221:
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 220;
                   break;
                case 222:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x1000000010L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 221;
                   break;
                case 223:
-                  if ((0x1000000010L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 222;
                   break;
                case 224:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 223;
                   break;
                case 225:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 224;
                   break;
                case 226:
-                  if ((0x200000002000000L & l) != 0L)
+                  if ((0x4000000040L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 225;
                   break;
                case 227:
-                  if ((0x4000000040L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 226;
                   break;
                case 228:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 227;
                   break;
                case 229:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 228;
                   break;
-               case 230:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 229;
+               case 231:
+                  if ((0x80000000800000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 230;
                   break;
                case 232:
-                  if ((0x80000000800000L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 231;
                   break;
                case 233:
-                  if ((0x8000000080000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 232;
                   break;
                case 234:
-                  if (curChar == 95)
+                  if ((0x1000000010L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 233;
                   break;
                case 235:
-                  if ((0x1000000010L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 234;
                   break;
                case 236:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 235;
                   break;
                case 237:
-                  if ((0x200000002L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 236;
                   break;
                case 238:
-                  if (curChar == 95)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 237;
                   break;
                case 239:
-                  if ((0x200000002000000L & l) != 0L)
+                  if ((0x4000000040L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 238;
                   break;
                case 240:
-                  if ((0x4000000040L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 239;
                   break;
                case 241:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 240;
                   break;
                case 242:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 241;
                   break;
                case 243:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 242;
-                  break;
-               case 244:
                   if ((0x10000000100000L & l) != 0L && kind > 8)
                      kind = 8;
                   break;
-               case 245:
-               case 254:
+               case 244:
+               case 253:
                   if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAdd(244); }
+                     { jjCheckNAdd(243); }
                   break;
-               case 246:
+               case 245:
                   if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 244;
+                  break;
+               case 246:
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 245;
                   break;
                case 247:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 246;
                   break;
                case 248:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 247;
                   break;
                case 249:
-                  if ((0x200000002000000L & l) != 0L)
+                  if ((0x4000000040L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 248;
                   break;
                case 250:
-                  if ((0x4000000040L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 249;
                   break;
                case 251:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 250;
                   break;
                case 252:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 251;
                   break;
-               case 253:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 252;
+               case 254:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 253;
                   break;
                case 255:
-                  if ((0x8000000080000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 254;
                   break;
                case 256:
-                  if (curChar == 95)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 255;
                   break;
                case 257:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 256;
                   break;
                case 258:
-                  if ((0x800000008000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 257;
                   break;
                case 259:
-                  if (curChar == 95)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 258;
                   break;
                case 260:
-                  if ((0x200000002000000L & l) != 0L)
+                  if ((0x4000000040L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 259;
                   break;
                case 261:
-                  if ((0x4000000040L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 260;
                   break;
                case 262:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 261;
                   break;
                case 263:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 262;
-                  break;
-               case 264:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 263;
+                     jjstateSet[jjnewStateCnt++] = 262;
                   break;
                default : break;
             }
@@ -2122,103 +2116,103 @@ else if (curChar == 124)
                   {
                      if (kind > 73)
                         kind = 73;
-                     { jjCheckNAddTwoStates(20, 21); }
+                     { jjCheckNAddTwoStates(18, 19); }
                   }
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(87, 90); }
+                     { jjCheckNAddStates(89, 92); }
                   if (jjCanMove_4(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(91, 94); }
+                     { jjCheckNAddStates(93, 96); }
                   break;
-               case 20:
+               case 18:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
                   if (kind > 73)
                      kind = 73;
-                  { jjCheckNAddTwoStates(20, 21); }
+                  { jjCheckNAddTwoStates(18, 19); }
                   break;
-               case 84:
+               case 83:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(87, 90); }
+                     { jjCheckNAddStates(89, 92); }
                   break;
-               case 86:
+               case 85:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(22, 24); }
                   break;
-               case 87:
+               case 86:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(22, 24); }
                   break;
-               case 88:
+               case 87:
                   if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 64)
                      kind = 64;
                   break;
-               case 90:
+               case 89:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(25, 27); }
                   break;
-               case 91:
+               case 90:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(25, 27); }
                   break;
-               case 92:
+               case 91:
                   if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 65)
                      kind = 65;
                   break;
+               case 94:
                case 95:
-               case 96:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(28, 30); }
                   break;
+               case 98:
                case 99:
-               case 100:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(31, 33); }
                   break;
+               case 103:
                case 104:
-               case 105:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(34, 36); }
                   break;
+               case 107:
                case 108:
-               case 109:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(37, 39); }
                   break;
-               case 111:
+               case 110:
                   if (jjCanMove_4(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(91, 94); }
+                     { jjCheckNAddStates(93, 96); }
                   break;
-               case 113:
+               case 112:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(40, 42); }
                   break;
-               case 114:
+               case 113:
                   if (jjCanMove_5(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(40, 42); }
                   break;
-               case 115:
+               case 114:
                   if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 64)
                      kind = 64;
                   break;
-               case 117:
+               case 116:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(43, 45); }
                   break;
-               case 118:
+               case 117:
                   if (jjCanMove_5(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(43, 45); }
                   break;
-               case 119:
+               case 118:
                   if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 66)
                      kind = 66;
                   break;
+               case 121:
                case 122:
-               case 123:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(46, 48); }
                   break;
+               case 125:
                case 126:
-               case 127:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(49, 51); }
                   break;
@@ -2233,7 +2227,7 @@ else if (curChar == 124)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 265 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 264 - (jjnewStateCnt = startsAt)))
          break;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { break; }
@@ -2292,12 +2286,13 @@ protected Token jjFillToken()
    return t;
 }
 static final int[] jjnextStates = {
-   146, 147, 138, 20, 21, 131, 132, 135, 121, 123, 125, 127, 94, 96, 98, 100, 
-   130, 131, 132, 133, 135, 136, 85, 87, 88, 89, 91, 92, 94, 96, 97, 98, 
-   100, 101, 103, 105, 106, 107, 109, 110, 112, 114, 115, 116, 118, 119, 121, 123, 
-   124, 125, 127, 128, 139, 140, 143, 230, 243, 253, 264, 186, 49, 203, 204, 208, 
-   210, 217, 156, 70, 161, 168, 172, 178, 75, 79, 81, 48, 49, 69, 71, 35, 
-   36, 23, 29, 103, 105, 107, 109, 85, 87, 89, 91, 112, 114, 116, 118, 
+   145, 146, 137, 18, 19, 130, 131, 134, 120, 122, 124, 126, 93, 95, 97, 99, 
+   129, 130, 131, 132, 134, 135, 84, 86, 87, 88, 90, 91, 93, 95, 96, 97, 
+   99, 100, 102, 104, 105, 106, 108, 109, 111, 113, 114, 115, 117, 118, 120, 122, 
+   123, 124, 126, 127, 138, 139, 142, 229, 242, 252, 263, 185, 47, 202, 203, 207, 
+   209, 216, 155, 68, 160, 167, 171, 177, 74, 78, 80, 71, 72, 46, 47, 67, 
+   69, 33, 34, 21, 27, 102, 104, 106, 108, 84, 86, 88, 90, 111, 113, 115, 
+   117, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -2533,7 +2528,7 @@ private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 265; i-- > 0;)
+    for (i = 264; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
@@ -2581,8 +2576,8 @@ public void SwitchTo(int lexState)
 };
     protected SimpleCharStream  input_stream;
 
-    private final int[] jjrounds = new int[265];
-    private final int[] jjstateSet = new int[2 * 265];
+    private final int[] jjrounds = new int[264];
+    private final int[] jjstateSet = new int[2 * 264];
     private final StringBuilder jjimage = new StringBuilder();
     private StringBuilder image = jjimage;
     private int jjimageLen;
diff --git a/src/test/java/com/cinchapi/ccl/GrammarTest.java b/src/test/java/com/cinchapi/ccl/GrammarTest.java
index 1c885e53..e6be44fc 100644
--- a/src/test/java/com/cinchapi/ccl/GrammarTest.java
+++ b/src/test/java/com/cinchapi/ccl/GrammarTest.java
@@ -668,7 +668,7 @@ public void testKeyConditionFunctionWithTimestamp() throws UnsupportedEncodingEx
     }
 
     @Test
-    public void testIndexFunctionWithTimestamp() throws UnsupportedEncodingException, ParseException {
+    public void testIndexFunctionWithTimestamp2() throws UnsupportedEncodingException, ParseException {
         String ccl = "avg(age, at today)";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(
                 StandardCharsets.UTF_8.name()));
@@ -677,6 +677,66 @@ public void testIndexFunctionWithTimestamp() throws UnsupportedEncodingException
         grammar.generateAST();
     }
 
+    @Test
+    public void testOrderByTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "order by > age in 1992-10-02";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyMultiRecordsFunctionWithTimestamp2() throws UnsupportedEncodingException, ParseException {
+        String ccl = "avg(age, [1,2,3,5,11], in 1992-10-02)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testImplicitKeyRecordFunction() throws UnsupportedEncodingException, ParseException {
+        String ccl = "age | avg";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testKeyCclFunctionWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "avg(age, age > 3, in 1992-10-02)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testImplicitKeyRecordFunctionTokenize() throws UnsupportedEncodingException, ParseException {
+        String ccl = "age | avg";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testIndexFunctionWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "avg(age, in 1992-10-02)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
     @Test
     public void testAddCommand() throws UnsupportedEncodingException, ParseException {
         String ccl = "add name as \"John Doe\" in 1";

From 09d4fb7e118e90b4f858c735eff2452c951a2f5f Mon Sep 17 00:00:00 2001
From: Javier Lores <lores.javier@gmail.com>
Date: Thu, 30 Jan 2025 11:56:10 -0500
Subject: [PATCH 6/9] fixed function

---
 grammar/grammar.jjt                           |    9 +-
 .../com/cinchapi/ccl/generated/Grammar.java   | 4337 +++++++----------
 2 files changed, 1751 insertions(+), 2595 deletions(-)

diff --git a/grammar/grammar.jjt b/grammar/grammar.jjt
index 8b63e2a4..b20b06fc 100644
--- a/grammar/grammar.jjt
+++ b/grammar/grammar.jjt
@@ -19,7 +19,6 @@ options {
     VISITOR=true;
     NODE_DEFAULT_VOID=true;
     STATIC=false;
-    DEBUG_LOOKAHEAD=true;
 }
 
 PARSER_BEGIN(Grammar)
@@ -254,10 +253,10 @@ TOKEN :
 
 ASTStart StartCommandLine() #Start : {}
 {
-   ( LOOKAHEAD(4)
+   (
      Command() "\n"
    |
-     LOOKAHEAD(3)
+     LOOKAHEAD(4)
      (<WHERE>)? DisjunctionExpression() (Order())? (Page())? "\n"
    |
      Page() "\n"
@@ -271,10 +270,10 @@ ASTStart StartCommandLine() #Start : {}
 
 ASTStart generateAST() #Start : {}
 {
-   ( LOOKAHEAD(4)
+   (
      Command() <EOF>
    |
-     LOOKAHEAD(3)
+     LOOKAHEAD(4)
      (<WHERE>)? DisjunctionExpression() (Order())? (Page())? <EOF>
    |
      Page() <EOF>
diff --git a/src/main/java/com/cinchapi/ccl/generated/Grammar.java b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
index bb096bef..e9ed3067 100644
--- a/src/main/java/com/cinchapi/ccl/generated/Grammar.java
+++ b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
@@ -78,18 +78,39 @@ public Object transformValue(String token) {
         return valueTransformFunction.apply(token);
     }
 
-  final public ASTStart StartCommandLine() throws ParseException {
-    trace_call("StartCommandLine");
-    try {
-/*@bgen(jjtree) Start */
+  final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree) Start */
   ASTStart jjtn000 = new ASTStart(JJTSTART);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-      try {
+    try {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ADD:
+      case SET:
+      case REMOVE:
+      case CLEAR:
+      case VERIFY_AND_SWAP:
+      case VERIFY_OR_SET:
+      case INSERT:
+      case LINK:
+      case UNLINK:
+      case SELECT:
+      case FETCH:
+      case GET:
+      case DESCRIBE:
+      case AUDIT:
+      case VERIFY:
+      case SEARCH:
+      case STAGE:
+      case COMMIT:
+      case ABORT:
+      case REVERT:{
+        Command();
+        jj_consume_token(78);
+        break;
+        }
+      default:
+        jj_la1[3] = jj_gen;
         if (jj_2_1(4)) {
-          Command();
-          jj_consume_token(78);
-        } else if (jj_2_2(3)) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case WHERE:{
             jj_consume_token(WHERE);
@@ -143,15 +164,16 @@ final public ASTStart StartCommandLine() throws ParseException {
             break;
             }
           default:
-            jj_la1[3] = jj_gen;
+            jj_la1[4] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
         }
+      }
 jjtree.closeNodeScope(jjtn000, true);
      jjtc000 = false;
 {if ("" != null) return jjtn000;}
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
        jjtree.clearNodeScope(jjtn000);
        jjtc000 = false;
@@ -165,36 +187,54 @@ final public ASTStart StartCommandLine() throws ParseException {
        {if (true) throw (ParseException)jjte000;}
      }
      {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
      }
-      }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("StartCommandLine");
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public ASTStart generateAST() throws ParseException {
-    trace_call("generateAST");
-    try {
-/*@bgen(jjtree) Start */
+  final public ASTStart generateAST() throws ParseException {/*@bgen(jjtree) Start */
   ASTStart jjtn000 = new ASTStart(JJTSTART);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-      try {
-        if (jj_2_3(4)) {
-          Command();
-          jj_consume_token(0);
-        } else if (jj_2_4(3)) {
+    try {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ADD:
+      case SET:
+      case REMOVE:
+      case CLEAR:
+      case VERIFY_AND_SWAP:
+      case VERIFY_OR_SET:
+      case INSERT:
+      case LINK:
+      case UNLINK:
+      case SELECT:
+      case FETCH:
+      case GET:
+      case DESCRIBE:
+      case AUDIT:
+      case VERIFY:
+      case SEARCH:
+      case STAGE:
+      case COMMIT:
+      case ABORT:
+      case REVERT:{
+        Command();
+        jj_consume_token(0);
+        break;
+        }
+      default:
+        jj_la1[8] = jj_gen;
+        if (jj_2_2(4)) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case WHERE:{
             jj_consume_token(WHERE);
             break;
             }
           default:
-            jj_la1[4] = jj_gen;
+            jj_la1[5] = jj_gen;
             ;
           }
           DisjunctionExpression();
@@ -204,7 +244,7 @@ final public ASTStart generateAST() throws ParseException {
             break;
             }
           default:
-            jj_la1[5] = jj_gen;
+            jj_la1[6] = jj_gen;
             ;
           }
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -214,7 +254,7 @@ final public ASTStart generateAST() throws ParseException {
             break;
             }
           default:
-            jj_la1[6] = jj_gen;
+            jj_la1[7] = jj_gen;
             ;
           }
           jj_consume_token(0);
@@ -241,15 +281,16 @@ final public ASTStart generateAST() throws ParseException {
             break;
             }
           default:
-            jj_la1[7] = jj_gen;
+            jj_la1[9] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
         }
+      }
 jjtree.closeNodeScope(jjtn000, true);
      jjtc000 = false;
 {if ("" != null) return jjtn000;}
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
        jjtree.clearNodeScope(jjtn000);
        jjtc000 = false;
@@ -263,30 +304,24 @@ final public ASTStart generateAST() throws ParseException {
        {if (true) throw (ParseException)jjte000;}
      }
      {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
      }
-      }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("generateAST");
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public ASTStart generateSubAST() throws ParseException {
-    trace_call("generateSubAST");
-    try {
-/*@bgen(jjtree) Start */
+  final public ASTStart generateSubAST() throws ParseException {/*@bgen(jjtree) Start */
   ASTStart jjtn000 = new ASTStart(JJTSTART);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-      try {
-        DisjunctionExpression();
+    try {
+      DisjunctionExpression();
 jjtree.closeNodeScope(jjtn000, true);
      jjtc000 = false;
 {if ("" != null) return jjtn000;}
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
        jjtree.clearNodeScope(jjtn000);
        jjtc000 = false;
@@ -300,40 +335,34 @@ final public ASTStart generateSubAST() throws ParseException {
        {if (true) throw (ParseException)jjte000;}
      }
      {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
        jjtree.closeNodeScope(jjtn000, true);
      }
-      }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("generateSubAST");
     }
+    throw new Error("Missing return statement in function");
 }
 
   final public void DisjunctionExpression() throws ParseException {
-    trace_call("DisjunctionExpression");
-    try {
-
-      ConjunctionExpression();
-      label_1:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case DISJUNCTION:{
-          ;
-          break;
-          }
-        default:
-          jj_la1[8] = jj_gen;
-          break label_1;
+    ConjunctionExpression();
+    label_1:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case DISJUNCTION:{
+        ;
+        break;
         }
+      default:
+        jj_la1[10] = jj_gen;
+        break label_1;
+      }
 ASTOr jjtn001 = new ASTOr(JJTOR);
                                boolean jjtc001 = true;
                                jjtree.openNodeScope(jjtn001);
-        try {
-          jj_consume_token(DISJUNCTION);
-          ConjunctionExpression();
-        } catch (Throwable jjte001) {
+      try {
+        jj_consume_token(DISJUNCTION);
+        ConjunctionExpression();
+      } catch (Throwable jjte001) {
 if (jjtc001) {
                                  jjtree.clearNodeScope(jjtn001);
                                  jjtc001 = false;
@@ -347,40 +376,34 @@ final public void DisjunctionExpression() throws ParseException {
                                  {if (true) throw (ParseException)jjte001;}
                                }
                                {if (true) throw (Error)jjte001;}
-        } finally {
+      } finally {
 if (jjtc001) {
                                  jjtree.closeNodeScope(jjtn001,  2);
                                }
-        }
       }
-    } finally {
-      trace_return("DisjunctionExpression");
     }
 }
 
   final public void ConjunctionExpression() throws ParseException {
-    trace_call("ConjunctionExpression");
-    try {
-
-      UnaryExpression();
-      label_2:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case CONJUNCTION:{
-          ;
-          break;
-          }
-        default:
-          jj_la1[9] = jj_gen;
-          break label_2;
+    UnaryExpression();
+    label_2:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case CONJUNCTION:{
+        ;
+        break;
         }
+      default:
+        jj_la1[11] = jj_gen;
+        break label_2;
+      }
 ASTAnd jjtn001 = new ASTAnd(JJTAND);
                          boolean jjtc001 = true;
                          jjtree.openNodeScope(jjtn001);
-        try {
-          jj_consume_token(CONJUNCTION);
-          UnaryExpression();
-        } catch (Throwable jjte001) {
+      try {
+        jj_consume_token(CONJUNCTION);
+        UnaryExpression();
+      } catch (Throwable jjte001) {
 if (jjtc001) {
                            jjtree.clearNodeScope(jjtn001);
                            jjtc001 = false;
@@ -394,51 +417,39 @@ final public void ConjunctionExpression() throws ParseException {
                            {if (true) throw (ParseException)jjte001;}
                          }
                          {if (true) throw (Error)jjte001;}
-        } finally {
+      } finally {
 if (jjtc001) {
                            jjtree.closeNodeScope(jjtn001,  2);
                          }
-        }
       }
-    } finally {
-      trace_return("ConjunctionExpression");
     }
 }
 
   final public void UnaryExpression() throws ParseException {
-    trace_call("UnaryExpression");
-    try {
-
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case OPEN_PARENTHESES:{
-        jj_consume_token(OPEN_PARENTHESES);
-        DisjunctionExpression();
-        jj_consume_token(CLOSE_PARENTHESES);
-        break;
-        }
-      case RESERVED_IDENTIFIER:
-      case NUMERIC:
-      case SIGNED_INTEGER:
-      case SIGNED_DECIMAL:
-      case ALPHANUMERIC:
-      case PERIOD_SEPARATED_STRING:{
-        RelationalExpression();
-        break;
-        }
-      default:
-        jj_la1[10] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    } finally {
-      trace_return("UnaryExpression");
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case OPEN_PARENTHESES:{
+      jj_consume_token(OPEN_PARENTHESES);
+      DisjunctionExpression();
+      jj_consume_token(CLOSE_PARENTHESES);
+      break;
+      }
+    case RESERVED_IDENTIFIER:
+    case NUMERIC:
+    case SIGNED_INTEGER:
+    case SIGNED_DECIMAL:
+    case ALPHANUMERIC:
+    case PERIOD_SEPARATED_STRING:{
+      RelationalExpression();
+      break;
+      }
+    default:
+      jj_la1[12] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
 }
 
-  final public void RelationalExpression() throws ParseException {
-    trace_call("RelationalExpression");
-    try {
-/*@bgen(jjtree) Expression */
+  final public void RelationalExpression() throws ParseException {/*@bgen(jjtree) Expression */
     ASTExpression jjtn000 = new ASTExpression(JJTEXPRESSION);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol key = null;
@@ -446,80 +457,80 @@ final public void RelationalExpression() throws ParseException {
     ValueTokenSymbol value1 = null;
     ValueTokenSymbol value2 = null;
     TimestampSymbol timestamp = null;
-      try {
-        key = Key();
+    try {
+      key = Key();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case LINKS_TO:{
+        operator = LinksToOperator();
+        value1 = LinksToValue();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case LINKS_TO:{
-          operator = LinksToOperator();
-          value1 = LinksToValue();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:
-          case TIMESTAMP:{
-            timestamp = Timestamp();
-            break;
-            }
-          default:
-            jj_la1[11] = jj_gen;
-            ;
-          }
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
-        case REGEX:
-        case NOT_REGEX:
-        case LIKE:
-        case NOT_LIKE:{
-          operator = RegexBasedOperator();
-          value1 = RegexValue();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:
-          case TIMESTAMP:{
-            timestamp = Timestamp();
-            break;
-            }
-          default:
-            jj_la1[12] = jj_gen;
-            ;
-          }
+        default:
+          jj_la1[13] = jj_gen;
+          ;
+        }
+        break;
+        }
+      case REGEX:
+      case NOT_REGEX:
+      case LIKE:
+      case NOT_LIKE:{
+        operator = RegexBasedOperator();
+        value1 = RegexValue();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
-        case UNARY_OPERATOR:
-        case OPEN_ANGLE_BRACKET:
-        case CLOSE_ANGLE_BRACKET:{
-          operator = UnaryOperator();
-          value1 = UnaryValue();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:
-          case TIMESTAMP:{
-            timestamp = Timestamp();
-            break;
-            }
-          default:
-            jj_la1[13] = jj_gen;
-            ;
-          }
+        default:
+          jj_la1[14] = jj_gen;
+          ;
+        }
+        break;
+        }
+      case UNARY_OPERATOR:
+      case OPEN_ANGLE_BRACKET:
+      case CLOSE_ANGLE_BRACKET:{
+        operator = UnaryOperator();
+        value1 = UnaryValue();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
-        case BINARY_OPERATOR:{
-          operator = BinaryOperator();
-          value1 = BinaryValue();
-          value2 = BinaryValue();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:
-          case TIMESTAMP:{
-            timestamp = Timestamp();
-            break;
-            }
-          default:
-            jj_la1[14] = jj_gen;
-            ;
-          }
+        default:
+          jj_la1[15] = jj_gen;
+          ;
+        }
+        break;
+        }
+      case BINARY_OPERATOR:{
+        operator = BinaryOperator();
+        value1 = BinaryValue();
+        value2 = BinaryValue();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
           break;
           }
         default:
-          jj_la1[15] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+          jj_la1[16] = jj_gen;
+          ;
+        }
+        break;
         }
+      default:
+        jj_la1[17] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.key(key);
@@ -527,7 +538,7 @@ final public void RelationalExpression() throws ParseException {
           jjtn000.addValue(value1);
           if(value2 != null) jjtn000.addValue(value2);
           if(timestamp != null) jjtn000.timestamp(timestamp);
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -541,136 +552,124 @@ final public void RelationalExpression() throws ParseException {
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("RelationalExpression");
     }
 }
 
-  final public KeyTokenSymbol Key() throws ParseException {
-    trace_call("Key");
-    try {
-FunctionKeySymbol function;
+  final public KeyTokenSymbol Key() throws ParseException {FunctionKeySymbol function;
   Token key;
-      if (jj_2_5(2)) {
-        function = KeyFunction();
+    if (jj_2_3(2)) {
+      function = KeyFunction();
 {if ("" != null) return function;}
-      } else {
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case RESERVED_IDENTIFIER:
+      case NUMERIC:
+      case SIGNED_INTEGER:
+      case SIGNED_DECIMAL:
+      case ALPHANUMERIC:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case RESERVED_IDENTIFIER:
-        case NUMERIC:
-        case SIGNED_INTEGER:
-        case SIGNED_DECIMAL:
+        case RESERVED_IDENTIFIER:{
+          key = jj_consume_token(RESERVED_IDENTIFIER);
+          break;
+          }
+        case SIGNED_INTEGER:{
+          key = jj_consume_token(SIGNED_INTEGER);
+          break;
+          }
+        case SIGNED_DECIMAL:{
+          key = jj_consume_token(SIGNED_DECIMAL);
+          break;
+          }
+        case NUMERIC:{
+          key = jj_consume_token(NUMERIC);
+          break;
+          }
         case ALPHANUMERIC:{
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case RESERVED_IDENTIFIER:{
-            key = jj_consume_token(RESERVED_IDENTIFIER);
-            break;
-            }
-          case SIGNED_INTEGER:{
-            key = jj_consume_token(SIGNED_INTEGER);
-            break;
-            }
-          case SIGNED_DECIMAL:{
-            key = jj_consume_token(SIGNED_DECIMAL);
-            break;
-            }
-          case NUMERIC:{
-            key = jj_consume_token(NUMERIC);
-            break;
-            }
-          case ALPHANUMERIC:{
-            key = jj_consume_token(ALPHANUMERIC);
-            break;
-            }
-          default:
-            jj_la1[16] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
-          }
-{if ("" != null) return new KeySymbol(key.image);}
-          break;
-          }
-        case PERIOD_SEPARATED_STRING:{
-          key = jj_consume_token(PERIOD_SEPARATED_STRING);
-{if ("" != null) return new NavigationKeySymbol(key.image);}
+          key = jj_consume_token(ALPHANUMERIC);
           break;
           }
         default:
-          jj_la1[17] = jj_gen;
+          jj_la1[18] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
+{if ("" != null) return new KeySymbol(key.image);}
+        break;
+        }
+      case PERIOD_SEPARATED_STRING:{
+        key = jj_consume_token(PERIOD_SEPARATED_STRING);
+{if ("" != null) return new NavigationKeySymbol(key.image);}
+        break;
+        }
+      default:
+        jj_la1[19] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("Key");
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public ValueTokenSymbol UnaryValue() throws ParseException {
-    trace_call("UnaryValue");
-    try {
-FunctionValueSymbol function;
+  final public ValueTokenSymbol UnaryValue() throws ParseException {FunctionValueSymbol function;
   Token key;
   Token word;
   String value = "";
   List<String> records = Lists.newArrayList();
   ASTStart ccl;
-      if (jj_2_7(2)) {
-        function = ValueFunction();
+    if (jj_2_5(2)) {
+      function = ValueFunction();
 {if ("" != null) return function;}
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case NUMERIC:
-        case SIGNED_INTEGER:
-        case SIGNED_DECIMAL:
-        case ALPHANUMERIC:
-        case PERIOD_SEPARATED_STRING:
-        case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-          label_3:
-          while (true) {
-            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case SIGNED_INTEGER:{
-              word = jj_consume_token(SIGNED_INTEGER);
-              break;
-              }
-            case SIGNED_DECIMAL:{
-              word = jj_consume_token(SIGNED_DECIMAL);
-              break;
-              }
-            case NUMERIC:{
-              word = jj_consume_token(NUMERIC);
-              break;
-              }
-            case ALPHANUMERIC:{
-              word = jj_consume_token(ALPHANUMERIC);
-              break;
-              }
-            case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-              word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
-              break;
-              }
-            case PERIOD_SEPARATED_STRING:{
-              word = jj_consume_token(PERIOD_SEPARATED_STRING);
-              break;
-              }
-            default:
-              jj_la1[18] = jj_gen;
-              jj_consume_token(-1);
-              throw new ParseException();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMERIC:
+      case SIGNED_INTEGER:
+      case SIGNED_DECIMAL:
+      case ALPHANUMERIC:
+      case PERIOD_SEPARATED_STRING:
+      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+        label_3:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case SIGNED_INTEGER:{
+            word = jj_consume_token(SIGNED_INTEGER);
+            break;
             }
-value += (value.equals("")) ? word.image : " " + word.image;
-            if (jj_2_6(2)) {
-              ;
-            } else {
-              break label_3;
+          case SIGNED_DECIMAL:{
+            word = jj_consume_token(SIGNED_DECIMAL);
+            break;
+            }
+          case NUMERIC:{
+            word = jj_consume_token(NUMERIC);
+            break;
+            }
+          case ALPHANUMERIC:{
+            word = jj_consume_token(ALPHANUMERIC);
+            break;
+            }
+          case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+            word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+            break;
             }
+          case PERIOD_SEPARATED_STRING:{
+            word = jj_consume_token(PERIOD_SEPARATED_STRING);
+            break;
+            }
+          default:
+            jj_la1[20] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
+value += (value.equals("")) ? word.image : " " + word.image;
+          if (jj_2_4(2)) {
+            ;
+          } else {
+            break label_3;
+          }
+        }
 if(value.charAt(0) == '$') {
         String var = value.substring(1);
         try {
@@ -693,85 +692,73 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         value = value.replace("\\@", "@");
     }
     {if ("" != null) return new ValueSymbol(transformValue(value));}
-          break;
-          }
-        case QUOTED_STRING:{
-          word = jj_consume_token(QUOTED_STRING);
+        break;
+        }
+      case QUOTED_STRING:{
+        word = jj_consume_token(QUOTED_STRING);
 {if ("" != null) return new ValueSymbol(transformValue(word.image.replace("\\\"", "\"")));}
-          break;
-          }
-        default:
-          jj_la1[19] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+        break;
         }
+      default:
+        jj_la1[21] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("UnaryValue");
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public ValueTokenSymbol LinksToValue() throws ParseException {
-    trace_call("LinksToValue");
-    try {
-Token word;
-      word = jj_consume_token(NUMERIC);
+  final public ValueTokenSymbol LinksToValue() throws ParseException {Token word;
+    word = jj_consume_token(NUMERIC);
 {if ("" != null) return new ValueSymbol(transformValue(word.image));}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("LinksToValue");
-    }
 }
 
-  final public ValueTokenSymbol RegexValue() throws ParseException {
-    trace_call("RegexValue");
-    try {
-Token word;
+  final public ValueTokenSymbol RegexValue() throws ParseException {Token word;
   String value = "";
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case OPEN_PARENTHESES:{
-        jj_consume_token(OPEN_PARENTHESES);
-        label_4:
-        while (true) {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case SIGNED_INTEGER:{
-            word = jj_consume_token(SIGNED_INTEGER);
-            break;
-            }
-          case SIGNED_DECIMAL:{
-            word = jj_consume_token(SIGNED_DECIMAL);
-            break;
-            }
-          case NUMERIC:{
-            word = jj_consume_token(NUMERIC);
-            break;
-            }
-          case ALPHANUMERIC:{
-            word = jj_consume_token(ALPHANUMERIC);
-            break;
-            }
-          case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-            word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
-            break;
-            }
-          case PERIOD_SEPARATED_STRING:{
-            word = jj_consume_token(PERIOD_SEPARATED_STRING);
-            break;
-            }
-          case 79:{
-            word = jj_consume_token(79);
-            break;
-            }
-          case 80:{
-            word = jj_consume_token(80);
-            break;
-            }
-          default:
-            jj_la1[20] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case OPEN_PARENTHESES:{
+      jj_consume_token(OPEN_PARENTHESES);
+      label_4:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case SIGNED_INTEGER:{
+          word = jj_consume_token(SIGNED_INTEGER);
+          break;
+          }
+        case SIGNED_DECIMAL:{
+          word = jj_consume_token(SIGNED_DECIMAL);
+          break;
+          }
+        case NUMERIC:{
+          word = jj_consume_token(NUMERIC);
+          break;
           }
+        case ALPHANUMERIC:{
+          word = jj_consume_token(ALPHANUMERIC);
+          break;
+          }
+        case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+          word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+          break;
+          }
+        case PERIOD_SEPARATED_STRING:{
+          word = jj_consume_token(PERIOD_SEPARATED_STRING);
+          break;
+          }
+        case 79:{
+          word = jj_consume_token(79);
+          break;
+          }
+        case 80:{
+          word = jj_consume_token(80);
+          break;
+          }
+        default:
+          jj_la1[22] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
 if (value.equals("") |
             value.endsWith("(") | word.image.equals(")") |
             value.endsWith("=") | word.image.equals("=") |
@@ -781,64 +768,64 @@ final public ValueTokenSymbol RegexValue() throws ParseException {
         else {
             value += " " + word.image;
         }
-          if (jj_2_8(4)) {
-            ;
-          } else {
-            break label_4;
-          }
+        if (jj_2_6(4)) {
+          ;
+        } else {
+          break label_4;
         }
-        jj_consume_token(CLOSE_PARENTHESES);
+      }
+      jj_consume_token(CLOSE_PARENTHESES);
 {if ("" != null) return new ValueSymbol(transformValue("(" + value + ")"));}
-        break;
-        }
-      case NUMERIC:
-      case SIGNED_INTEGER:
-      case SIGNED_DECIMAL:
-      case ALPHANUMERIC:
-      case PERIOD_SEPARATED_STRING:
-      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:
-      case 79:
-      case 80:{
-        label_5:
-        while (true) {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case SIGNED_INTEGER:{
-            word = jj_consume_token(SIGNED_INTEGER);
-            break;
-            }
-          case SIGNED_DECIMAL:{
-            word = jj_consume_token(SIGNED_DECIMAL);
-            break;
-            }
-          case NUMERIC:{
-            word = jj_consume_token(NUMERIC);
-            break;
-            }
-          case ALPHANUMERIC:{
-            word = jj_consume_token(ALPHANUMERIC);
-            break;
-            }
-          case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-            word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
-            break;
-            }
-          case PERIOD_SEPARATED_STRING:{
-            word = jj_consume_token(PERIOD_SEPARATED_STRING);
-            break;
-            }
-          case 79:{
-            word = jj_consume_token(79);
-            break;
-            }
-          case 80:{
-            word = jj_consume_token(80);
-            break;
-            }
-          default:
-            jj_la1[21] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+      break;
+      }
+    case NUMERIC:
+    case SIGNED_INTEGER:
+    case SIGNED_DECIMAL:
+    case ALPHANUMERIC:
+    case PERIOD_SEPARATED_STRING:
+    case NON_ALPHANUMERIC_AND_ALPHANUMERIC:
+    case 79:
+    case 80:{
+      label_5:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case SIGNED_INTEGER:{
+          word = jj_consume_token(SIGNED_INTEGER);
+          break;
+          }
+        case SIGNED_DECIMAL:{
+          word = jj_consume_token(SIGNED_DECIMAL);
+          break;
+          }
+        case NUMERIC:{
+          word = jj_consume_token(NUMERIC);
+          break;
+          }
+        case ALPHANUMERIC:{
+          word = jj_consume_token(ALPHANUMERIC);
+          break;
+          }
+        case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+          word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+          break;
           }
+        case PERIOD_SEPARATED_STRING:{
+          word = jj_consume_token(PERIOD_SEPARATED_STRING);
+          break;
+          }
+        case 79:{
+          word = jj_consume_token(79);
+          break;
+          }
+        case 80:{
+          word = jj_consume_token(80);
+          break;
+          }
+        default:
+          jj_la1[23] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
 if (value.equals("") |
             value.endsWith("(") | word.image.equals(")") |
             value.endsWith("=") | word.image.equals("=") |
@@ -848,81 +835,75 @@ final public ValueTokenSymbol RegexValue() throws ParseException {
         else {
             value += " " + word.image;
         }
-          if (jj_2_9(3)) {
-            ;
-          } else {
-            break label_5;
-          }
+        if (jj_2_7(3)) {
+          ;
+        } else {
+          break label_5;
         }
+      }
 {if ("" != null) return new ValueSymbol(transformValue(value));}
-        break;
-        }
-      case QUOTED_STRING:{
-        word = jj_consume_token(QUOTED_STRING);
-{if ("" != null) return new ValueSymbol(transformValue(word.image.replace("\\\"", "\"")));}
-        break;
-        }
-      default:
-        jj_la1[22] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+      break;
+      }
+    case QUOTED_STRING:{
+      word = jj_consume_token(QUOTED_STRING);
+{if ("" != null) return new ValueSymbol(transformValue(word.image.replace("\\\"", "\"")));}
+      break;
       }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("RegexValue");
+    default:
+      jj_la1[24] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public ValueTokenSymbol BinaryValue() throws ParseException {
-    trace_call("BinaryValue");
-    try {
-FunctionValueSymbol function;
+  final public ValueTokenSymbol BinaryValue() throws ParseException {FunctionValueSymbol function;
   Token key;
   Token word;
   String value = "";
   List<String> records = Lists.newArrayList();
   ASTStart ccl;
-      if (jj_2_10(2)) {
-        function = ValueFunction();
+    if (jj_2_8(2)) {
+      function = ValueFunction();
 {if ("" != null) return function;}
-      } else {
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMERIC:
+      case SIGNED_INTEGER:
+      case SIGNED_DECIMAL:
+      case ALPHANUMERIC:
+      case PERIOD_SEPARATED_STRING:
+      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case NUMERIC:
-        case SIGNED_INTEGER:
-        case SIGNED_DECIMAL:
-        case ALPHANUMERIC:
-        case PERIOD_SEPARATED_STRING:
+        case SIGNED_INTEGER:{
+          word = jj_consume_token(SIGNED_INTEGER);
+          break;
+          }
+        case SIGNED_DECIMAL:{
+          word = jj_consume_token(SIGNED_DECIMAL);
+          break;
+          }
+        case NUMERIC:{
+          word = jj_consume_token(NUMERIC);
+          break;
+          }
+        case ALPHANUMERIC:{
+          word = jj_consume_token(ALPHANUMERIC);
+          break;
+          }
         case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case SIGNED_INTEGER:{
-            word = jj_consume_token(SIGNED_INTEGER);
-            break;
-            }
-          case SIGNED_DECIMAL:{
-            word = jj_consume_token(SIGNED_DECIMAL);
-            break;
-            }
-          case NUMERIC:{
-            word = jj_consume_token(NUMERIC);
-            break;
-            }
-          case ALPHANUMERIC:{
-            word = jj_consume_token(ALPHANUMERIC);
-            break;
-            }
-          case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-            word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
-            break;
-            }
-          case PERIOD_SEPARATED_STRING:{
-            word = jj_consume_token(PERIOD_SEPARATED_STRING);
-            break;
-            }
-          default:
-            jj_la1[23] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+          word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+          break;
           }
+        case PERIOD_SEPARATED_STRING:{
+          word = jj_consume_token(PERIOD_SEPARATED_STRING);
+          break;
+          }
+        default:
+          jj_la1[25] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
 value = word.image;
     if(value.charAt(0) == '$') {
         String var = value.substring(1);
@@ -946,221 +927,185 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         value = value.replace("\\@", "@");
     }
     {if ("" != null) return new ValueSymbol(transformValue(value));}
-          break;
-          }
-        case QUOTED_STRING:{
-          word = jj_consume_token(QUOTED_STRING);
+        break;
+        }
+      case QUOTED_STRING:{
+        word = jj_consume_token(QUOTED_STRING);
 {if ("" != null) return new ValueSymbol(transformValue(word.image.replace("\\\"", "\"")));}
-          break;
-          }
-        default:
-          jj_la1[24] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+        break;
         }
+      default:
+        jj_la1[26] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("BinaryValue");
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public OperatorSymbol LinksToOperator() throws ParseException {
-    trace_call("LinksToOperator");
-    try {
-Token operator;
-      operator = jj_consume_token(LINKS_TO);
+  final public OperatorSymbol LinksToOperator() throws ParseException {Token operator;
+    operator = jj_consume_token(LINKS_TO);
 {if ("" != null) return new OperatorSymbol(transformOperator(operator.image));}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("LinksToOperator");
-    }
 }
 
-  final public OperatorSymbol RegexBasedOperator() throws ParseException {
-    trace_call("RegexBasedOperator");
-    try {
-Token operator;
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case REGEX:{
-        operator = jj_consume_token(REGEX);
-        break;
-        }
-      case NOT_REGEX:{
-        operator = jj_consume_token(NOT_REGEX);
-        break;
-        }
-      case LIKE:{
-        operator = jj_consume_token(LIKE);
-        break;
-        }
-      case NOT_LIKE:{
-        operator = jj_consume_token(NOT_LIKE);
-        break;
-        }
-      default:
-        jj_la1[25] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+  final public OperatorSymbol RegexBasedOperator() throws ParseException {Token operator;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case REGEX:{
+      operator = jj_consume_token(REGEX);
+      break;
+      }
+    case NOT_REGEX:{
+      operator = jj_consume_token(NOT_REGEX);
+      break;
       }
+    case LIKE:{
+      operator = jj_consume_token(LIKE);
+      break;
+      }
+    case NOT_LIKE:{
+      operator = jj_consume_token(NOT_LIKE);
+      break;
+      }
+    default:
+      jj_la1[27] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
 {if ("" != null) return new OperatorSymbol(transformOperator(operator.image));}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("RegexBasedOperator");
-    }
 }
 
-  final public OperatorSymbol UnaryOperator() throws ParseException {
-    trace_call("UnaryOperator");
-    try {
-Token operator;
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case UNARY_OPERATOR:{
-        operator = jj_consume_token(UNARY_OPERATOR);
-        break;
-        }
-      case OPEN_ANGLE_BRACKET:{
-        operator = jj_consume_token(OPEN_ANGLE_BRACKET);
-        break;
-        }
-      case CLOSE_ANGLE_BRACKET:{
-        operator = jj_consume_token(CLOSE_ANGLE_BRACKET);
-        break;
-        }
-      default:
-        jj_la1[26] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+  final public OperatorSymbol UnaryOperator() throws ParseException {Token operator;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case UNARY_OPERATOR:{
+      operator = jj_consume_token(UNARY_OPERATOR);
+      break;
+      }
+    case OPEN_ANGLE_BRACKET:{
+      operator = jj_consume_token(OPEN_ANGLE_BRACKET);
+      break;
+      }
+    case CLOSE_ANGLE_BRACKET:{
+      operator = jj_consume_token(CLOSE_ANGLE_BRACKET);
+      break;
       }
+    default:
+      jj_la1[28] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
 {if ("" != null) return new OperatorSymbol(transformOperator(operator.image));}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("UnaryOperator");
-    }
 }
 
-  final public OperatorSymbol BinaryOperator() throws ParseException {
-    trace_call("BinaryOperator");
-    try {
-Token operator;
-      operator = jj_consume_token(BINARY_OPERATOR);
+  final public OperatorSymbol BinaryOperator() throws ParseException {Token operator;
+    operator = jj_consume_token(BINARY_OPERATOR);
 {if ("" != null) return new OperatorSymbol(transformOperator(operator.image));}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("BinaryOperator");
-    }
 }
 
-  final public TimestampSymbol Timestamp() throws ParseException {
-    trace_call("Timestamp");
-    try {
-Token word;
+  final public TimestampSymbol Timestamp() throws ParseException {Token word;
   String timestamp = "";
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case TIMESTAMP:{
+      jj_consume_token(TIMESTAMP);
+      break;
+      }
+    case IN:{
+      jj_consume_token(IN);
+      break;
+      }
+    default:
+      jj_la1[29] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    label_6:
+    while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case TIMESTAMP:{
-        jj_consume_token(TIMESTAMP);
+      case QUOTED_STRING:{
+        word = jj_consume_token(QUOTED_STRING);
         break;
         }
-      case IN:{
-        jj_consume_token(IN);
+      case SIGNED_INTEGER:{
+        word = jj_consume_token(SIGNED_INTEGER);
+        break;
+        }
+      case SIGNED_DECIMAL:{
+        word = jj_consume_token(SIGNED_DECIMAL);
+        break;
+        }
+      case NUMERIC:{
+        word = jj_consume_token(NUMERIC);
+        break;
+        }
+      case ALPHANUMERIC:{
+        word = jj_consume_token(ALPHANUMERIC);
+        break;
+        }
+      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+        word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
         break;
         }
       default:
-        jj_la1[27] = jj_gen;
+        jj_la1[30] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      label_6:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case QUOTED_STRING:{
-          word = jj_consume_token(QUOTED_STRING);
-          break;
-          }
-        case SIGNED_INTEGER:{
-          word = jj_consume_token(SIGNED_INTEGER);
-          break;
-          }
-        case SIGNED_DECIMAL:{
-          word = jj_consume_token(SIGNED_DECIMAL);
-          break;
-          }
-        case NUMERIC:{
-          word = jj_consume_token(NUMERIC);
-          break;
-          }
-        case ALPHANUMERIC:{
-          word = jj_consume_token(ALPHANUMERIC);
-          break;
-          }
-        case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
-          word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
-          break;
-          }
-        default:
-          jj_la1[28] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
 timestamp += (timestamp.equals("")) ? word.image : " " + word.image;
-        if (jj_2_11(2)) {
-          ;
-        } else {
-          break label_6;
-        }
+      if (jj_2_9(2)) {
+        ;
+      } else {
+        break label_6;
       }
+    }
 {if ("" != null) return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp));}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("Timestamp");
-    }
 }
 
-  final public void Page() throws ParseException {
-    trace_call("Page");
-    try {
-/*@bgen(jjtree) Page */
+  final public void Page() throws ParseException {/*@bgen(jjtree) Page */
   ASTPage jjtn000 = new ASTPage(JJTPAGE);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);String number = null;
   String size = null;
-      try {
+    try {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PAGE:{
+        number = Number();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case PAGE:{
-          number = Number();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case SIZE:{
-            size = Size();
-            break;
-            }
-          default:
-            jj_la1[29] = jj_gen;
-            ;
-          }
-          break;
-          }
         case SIZE:{
           size = Size();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case PAGE:{
-            number = Number();
-            break;
-            }
-          default:
-            jj_la1[30] = jj_gen;
-            ;
-          }
           break;
           }
         default:
           jj_la1[31] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+          ;
+        }
+        break;
+        }
+      case SIZE:{
+        size = Size();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case PAGE:{
+          number = Number();
+          break;
+          }
+        default:
+          jj_la1[32] = jj_gen;
+          ;
+        }
+        break;
         }
+      default:
+        jj_la1[33] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
 jjtree.closeNodeScope(jjtn000, true);
     jjtc000 = false;
 jjtn000.page(new PageSymbol(number != null ? Integer.parseInt(number) : null, size != null ? Integer.parseInt(size) : null));
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
       jjtree.clearNodeScope(jjtn000);
       jjtc000 = false;
@@ -1174,73 +1119,55 @@ final public void Page() throws ParseException {
       {if (true) throw (ParseException)jjte000;}
     }
     {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
     }
-      }
-    } finally {
-      trace_return("Page");
     }
 }
 
-  final public String Number() throws ParseException {
-    trace_call("Number");
-    try {
-Token number;
-      jj_consume_token(PAGE);
-      number = jj_consume_token(NUMERIC);
+  final public String Number() throws ParseException {Token number;
+    jj_consume_token(PAGE);
+    number = jj_consume_token(NUMERIC);
 {if ("" != null) return number.image;}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("Number");
-    }
 }
 
-  final public String Size() throws ParseException {
-    trace_call("Size");
-    try {
-Token size;
-      jj_consume_token(SIZE);
-      size = jj_consume_token(NUMERIC);
+  final public String Size() throws ParseException {Token size;
+    jj_consume_token(SIZE);
+    size = jj_consume_token(NUMERIC);
 {if ("" != null) return size.image;}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("Size");
-    }
 }
 
-  final public void Order() throws ParseException {
-    trace_call("Order");
-    try {
-/*@bgen(jjtree) Order */
+  final public void Order() throws ParseException {/*@bgen(jjtree) Order */
     ASTOrder jjtn000 = new ASTOrder(JJTORDER);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);OrderSymbol order = new OrderSymbol();
     OrderComponentSymbol orderComponent;
-      try {
-        jj_consume_token(ORDER);
-        orderComponent = OrderClause();
+    try {
+      jj_consume_token(ORDER);
+      orderComponent = OrderClause();
 order.add(orderComponent);
-        label_7:
-        while (true) {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case COMMA:{
-            ;
-            break;
-            }
-          default:
-            jj_la1[32] = jj_gen;
-            break label_7;
+      label_7:
+      while (true) {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case COMMA:{
+          ;
+          break;
           }
-          jj_consume_token(COMMA);
-          orderComponent = OrderClause();
-order.add(orderComponent);
+        default:
+          jj_la1[34] = jj_gen;
+          break label_7;
         }
+        jj_consume_token(COMMA);
+        orderComponent = OrderClause();
+order.add(orderComponent);
+      }
 jjtree.closeNodeScope(jjtn000, true);
     jjtc000 = false;
 jjtn000.order(order);
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
       jjtree.clearNodeScope(jjtn000);
       jjtc000 = false;
@@ -1254,63 +1181,57 @@ final public void Order() throws ParseException {
       {if (true) throw (ParseException)jjte000;}
     }
     {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
     }
-      }
-    } finally {
-      trace_return("Order");
     }
 }
 
-  final public OrderComponentSymbol OrderClause() throws ParseException {
-    trace_call("OrderClause");
-    try {
-KeyTokenSymbol key;
+  final public OrderComponentSymbol OrderClause() throws ParseException {KeyTokenSymbol key;
     TimestampSymbol timestamp = null;
     DirectionSymbol direction = null;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case OPEN_ANGLE_BRACKET:
+    case CLOSE_ANGLE_BRACKET:{
+      direction = SymbolicDirection();
+      key = Key();
+      break;
+      }
+    case RESERVED_IDENTIFIER:
+    case NUMERIC:
+    case SIGNED_INTEGER:
+    case SIGNED_DECIMAL:
+    case ALPHANUMERIC:
+    case PERIOD_SEPARATED_STRING:{
+      key = Key();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case OPEN_ANGLE_BRACKET:
-      case CLOSE_ANGLE_BRACKET:{
-        direction = SymbolicDirection();
-        key = Key();
-        break;
-        }
-      case RESERVED_IDENTIFIER:
-      case NUMERIC:
-      case SIGNED_INTEGER:
-      case SIGNED_DECIMAL:
-      case ALPHANUMERIC:
-      case PERIOD_SEPARATED_STRING:{
-        key = Key();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case ASC:
-        case DESC:{
-          direction = WordDirection();
-          break;
-          }
-        default:
-          jj_la1[33] = jj_gen;
-          ;
-        }
-        break;
-        }
-      default:
-        jj_la1[34] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case IN:
-      case TIMESTAMP:{
-        timestamp = Timestamp();
+      case ASC:
+      case DESC:{
+        direction = WordDirection();
         break;
         }
       default:
         jj_la1[35] = jj_gen;
         ;
       }
+      break;
+      }
+    default:
+      jj_la1[36] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case TIMESTAMP:{
+      timestamp = Timestamp();
+      break;
+      }
+    default:
+      jj_la1[37] = jj_gen;
+      ;
+    }
 if(direction != null) {
           if(timestamp != null) {
               {if ("" != null) return new OrderComponentSymbol(key, timestamp, direction);}
@@ -1330,89 +1251,71 @@ final public OrderComponentSymbol OrderClause() throws ParseException {
           }
       }
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("OrderClause");
-    }
 }
 
-  final public DirectionSymbol SymbolicDirection() throws ParseException {
-    trace_call("SymbolicDirection");
-    try {
-Token direction;
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case OPEN_ANGLE_BRACKET:{
-        direction = jj_consume_token(OPEN_ANGLE_BRACKET);
+  final public DirectionSymbol SymbolicDirection() throws ParseException {Token direction;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case OPEN_ANGLE_BRACKET:{
+      direction = jj_consume_token(OPEN_ANGLE_BRACKET);
 {if ("" != null) return DirectionSymbol.ASCENDING;}
-        break;
-        }
-      case CLOSE_ANGLE_BRACKET:{
-        direction = jj_consume_token(CLOSE_ANGLE_BRACKET);
+      break;
+      }
+    case CLOSE_ANGLE_BRACKET:{
+      direction = jj_consume_token(CLOSE_ANGLE_BRACKET);
 {if ("" != null) return DirectionSymbol.DESCENDING;}
-        break;
-        }
-      default:
-        jj_la1[36] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+      break;
       }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("SymbolicDirection");
+    default:
+      jj_la1[38] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public DirectionSymbol WordDirection() throws ParseException {
-    trace_call("WordDirection");
-    try {
-Token direction;
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ASC:{
-        direction = jj_consume_token(ASC);
+  final public DirectionSymbol WordDirection() throws ParseException {Token direction;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ASC:{
+      direction = jj_consume_token(ASC);
 {if ("" != null) return DirectionSymbol.ASCENDING;}
-        break;
-        }
-      case DESC:{
-        direction = jj_consume_token(DESC);
+      break;
+      }
+    case DESC:{
+      direction = jj_consume_token(DESC);
 {if ("" != null) return DirectionSymbol.DESCENDING;}
-        break;
-        }
-      default:
-        jj_la1[37] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+      break;
       }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("WordDirection");
+    default:
+      jj_la1[39] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void Function() throws ParseException {
-    trace_call("Function");
-    try {
-/*@bgen(jjtree) Function */
+  final public void Function() throws ParseException {/*@bgen(jjtree) Function */
     ASTFunction jjtn000 = new ASTFunction(JJTFUNCTION);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);FunctionTokenSymbol function;
-      try {
-        if (jj_2_12(2)) {
-          function = KeyFunction();
-        } else {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case ALPHANUMERIC:{
-            function = ValueFunction();
-            break;
-            }
-          default:
-            jj_la1[38] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+    try {
+      if (jj_2_10(2)) {
+        function = KeyFunction();
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case ALPHANUMERIC:{
+          function = ValueFunction();
+          break;
           }
+        default:
+          jj_la1[40] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
+      }
 jjtree.closeNodeScope(jjtn000, true);
     jjtc000 = false;
 jjtn000.function(function);
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
       jjtree.clearNodeScope(jjtn000);
       jjtc000 = false;
@@ -1426,21 +1329,56 @@ final public void Function() throws ParseException {
       {if (true) throw (ParseException)jjte000;}
     }
     {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
       jjtree.closeNodeScope(jjtn000, true);
     }
-      }
-    } finally {
-      trace_return("Function");
     }
 }
 
-  final public FunctionKeySymbol KeyFunction() throws ParseException {
-    trace_call("KeyFunction");
-    try {
-Token key;
+  final public FunctionKeySymbol KeyFunction() throws ParseException {Token key;
   Token function;
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case SIGNED_INTEGER:{
+      key = jj_consume_token(SIGNED_INTEGER);
+      break;
+      }
+    case SIGNED_DECIMAL:{
+      key = jj_consume_token(SIGNED_DECIMAL);
+      break;
+      }
+    case NUMERIC:{
+      key = jj_consume_token(NUMERIC);
+      break;
+      }
+    case ALPHANUMERIC:{
+      key = jj_consume_token(ALPHANUMERIC);
+      break;
+      }
+    case PERIOD_SEPARATED_STRING:{
+      key = jj_consume_token(PERIOD_SEPARATED_STRING);
+      break;
+      }
+    default:
+      jj_la1[41] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    jj_consume_token(PIPE);
+    function = jj_consume_token(ALPHANUMERIC);
+{if ("" != null) return new FunctionKeySymbol(new ImplicitKeyRecordFunction(function.image, key.image.substring(0, key.image.length())));}
+    throw new Error("Missing return statement in function");
+}
+
+  final public FunctionValueSymbol ValueFunction() throws ParseException {Token function;
+  Token key;
+  Token word;
+  List<String> records = Lists.newArrayList();
+  ASTStart ccl;
+  TimestampSymbol timestamp = null;
+    function = jj_consume_token(ALPHANUMERIC);
+    jj_consume_token(OPEN_PARENTHESES);
+    if (jj_2_11(3)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SIGNED_INTEGER:{
         key = jj_consume_token(SIGNED_INTEGER);
@@ -1450,8 +1388,45 @@ final public FunctionKeySymbol KeyFunction() throws ParseException {
         key = jj_consume_token(SIGNED_DECIMAL);
         break;
         }
-      case NUMERIC:{
-        key = jj_consume_token(NUMERIC);
+      case ALPHANUMERIC:{
+        key = jj_consume_token(ALPHANUMERIC);
+        break;
+        }
+      case PERIOD_SEPARATED_STRING:{
+        key = jj_consume_token(PERIOD_SEPARATED_STRING);
+        break;
+        }
+      default:
+        jj_la1[42] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case CLOSE_PARENTHESES:{
+        jj_consume_token(CLOSE_PARENTHESES);
+{if ("" != null) return new FunctionValueSymbol(new IndexFunction(function.image, key.image));}
+        break;
+        }
+      case COMMA:{
+        jj_consume_token(COMMA);
+        timestamp = Timestamp();
+        jj_consume_token(CLOSE_PARENTHESES);
+{if ("" != null) return new FunctionValueSymbol(new IndexFunction(function.image, key.image, timestamp.timestamp()));}
+        break;
+        }
+      default:
+        jj_la1[43] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } else if (jj_2_12(3)) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case SIGNED_INTEGER:{
+        key = jj_consume_token(SIGNED_INTEGER);
+        break;
+        }
+      case SIGNED_DECIMAL:{
+        key = jj_consume_token(SIGNED_DECIMAL);
         break;
         }
       case ALPHANUMERIC:{
@@ -1463,72 +1438,124 @@ final public FunctionKeySymbol KeyFunction() throws ParseException {
         break;
         }
       default:
-        jj_la1[39] = jj_gen;
+        jj_la1[44] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-      jj_consume_token(PIPE);
-      function = jj_consume_token(ALPHANUMERIC);
-{if ("" != null) return new FunctionKeySymbol(new ImplicitKeyRecordFunction(function.image, key.image.substring(0, key.image.length())));}
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("KeyFunction");
-    }
-}
-
-  final public FunctionValueSymbol ValueFunction() throws ParseException {
-    trace_call("ValueFunction");
-    try {
-Token function;
-  Token key;
-  Token word;
-  List<String> records = Lists.newArrayList();
-  ASTStart ccl;
-  TimestampSymbol timestamp = null;
-      function = jj_consume_token(ALPHANUMERIC);
-      jj_consume_token(OPEN_PARENTHESES);
-      if (jj_2_13(3)) {
+      jj_consume_token(COMMA);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMERIC:
+      case SIGNED_INTEGER:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case SIGNED_INTEGER:{
-          key = jj_consume_token(SIGNED_INTEGER);
-          break;
-          }
-        case SIGNED_DECIMAL:{
-          key = jj_consume_token(SIGNED_DECIMAL);
-          break;
-          }
-        case ALPHANUMERIC:{
-          key = jj_consume_token(ALPHANUMERIC);
+          word = jj_consume_token(SIGNED_INTEGER);
           break;
           }
-        case PERIOD_SEPARATED_STRING:{
-          key = jj_consume_token(PERIOD_SEPARATED_STRING);
+        case NUMERIC:{
+          word = jj_consume_token(NUMERIC);
           break;
           }
         default:
-          jj_la1[40] = jj_gen;
+          jj_la1[45] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
+records.add(word.image);
+        label_8:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case COMMA:{
+            ;
+            break;
+            }
+          default:
+            jj_la1[46] = jj_gen;
+            break label_8;
+          }
+          jj_consume_token(COMMA);
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case SIGNED_INTEGER:{
+            word = jj_consume_token(SIGNED_INTEGER);
+            break;
+            }
+          case NUMERIC:{
+            word = jj_consume_token(NUMERIC);
+            break;
+            }
+          default:
+            jj_la1[47] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+records.add(word.image);
+        }
+        jj_consume_token(CLOSE_PARENTHESES);
+{if ("" != null) return new FunctionValueSymbol(new KeyRecordsFunction(function.image, key.image, records));}
+        break;
+        }
+      case OPEN_BRACKET:{
+        jj_consume_token(OPEN_BRACKET);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case CLOSE_PARENTHESES:{
-          jj_consume_token(CLOSE_PARENTHESES);
-{if ("" != null) return new FunctionValueSymbol(new IndexFunction(function.image, key.image));}
+        case SIGNED_INTEGER:{
+          word = jj_consume_token(SIGNED_INTEGER);
           break;
           }
-        case COMMA:{
-          jj_consume_token(COMMA);
-          timestamp = Timestamp();
-          jj_consume_token(CLOSE_PARENTHESES);
-{if ("" != null) return new FunctionValueSymbol(new IndexFunction(function.image, key.image, timestamp.timestamp()));}
+        case NUMERIC:{
+          word = jj_consume_token(NUMERIC);
           break;
           }
         default:
-          jj_la1[41] = jj_gen;
+          jj_la1[48] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
-      } else if (jj_2_14(3)) {
+records.add(word.image);
+        label_9:
+        while (true) {
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case COMMA:{
+            ;
+            break;
+            }
+          default:
+            jj_la1[49] = jj_gen;
+            break label_9;
+          }
+          jj_consume_token(COMMA);
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case SIGNED_INTEGER:{
+            word = jj_consume_token(SIGNED_INTEGER);
+            break;
+            }
+          case NUMERIC:{
+            word = jj_consume_token(NUMERIC);
+            break;
+            }
+          default:
+            jj_la1[50] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
+          }
+records.add(word.image);
+        }
+        jj_consume_token(CLOSE_BRACKET);
+        jj_consume_token(COMMA);
+        timestamp = Timestamp();
+        jj_consume_token(CLOSE_PARENTHESES);
+{if ("" != null) return new FunctionValueSymbol(new KeyRecordsFunction(function.image, key.image, records, timestamp.timestamp()));}
+        break;
+        }
+      default:
+        jj_la1[51] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case SIGNED_INTEGER:
+      case SIGNED_DECIMAL:
+      case ALPHANUMERIC:
+      case PERIOD_SEPARATED_STRING:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case SIGNED_INTEGER:{
           key = jj_consume_token(SIGNED_INTEGER);
@@ -1547,294 +1574,140 @@ final public FunctionValueSymbol ValueFunction() throws ParseException {
           break;
           }
         default:
-          jj_la1[42] = jj_gen;
+          jj_la1[52] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         jj_consume_token(COMMA);
+        ccl = generateSubAST();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case NUMERIC:
-        case SIGNED_INTEGER:{
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case SIGNED_INTEGER:{
-            word = jj_consume_token(SIGNED_INTEGER);
-            break;
-            }
-          case NUMERIC:{
-            word = jj_consume_token(NUMERIC);
-            break;
-            }
-          default:
-            jj_la1[43] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
-          }
-records.add(word.image);
-          label_8:
-          while (true) {
-            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case COMMA:{
-              ;
-              break;
-              }
-            default:
-              jj_la1[44] = jj_gen;
-              break label_8;
-            }
-            jj_consume_token(COMMA);
-            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case SIGNED_INTEGER:{
-              word = jj_consume_token(SIGNED_INTEGER);
-              break;
-              }
-            case NUMERIC:{
-              word = jj_consume_token(NUMERIC);
-              break;
-              }
-            default:
-              jj_la1[45] = jj_gen;
-              jj_consume_token(-1);
-              throw new ParseException();
-            }
-records.add(word.image);
-          }
+        case CLOSE_PARENTHESES:{
           jj_consume_token(CLOSE_PARENTHESES);
-{if ("" != null) return new FunctionValueSymbol(new KeyRecordsFunction(function.image, key.image, records));}
+ConditionTree tree = (ConditionTree) ccl.jjtAccept(visitor, null);
+          {if ("" != null) return new FunctionValueSymbol(new KeyConditionFunction(function.image, key.image, tree));}
           break;
           }
-        case OPEN_BRACKET:{
-          jj_consume_token(OPEN_BRACKET);
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case SIGNED_INTEGER:{
-            word = jj_consume_token(SIGNED_INTEGER);
-            break;
-            }
-          case NUMERIC:{
-            word = jj_consume_token(NUMERIC);
-            break;
-            }
-          default:
-            jj_la1[46] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
-          }
-records.add(word.image);
-          label_9:
-          while (true) {
-            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case COMMA:{
-              ;
-              break;
-              }
-            default:
-              jj_la1[47] = jj_gen;
-              break label_9;
-            }
-            jj_consume_token(COMMA);
-            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case SIGNED_INTEGER:{
-              word = jj_consume_token(SIGNED_INTEGER);
-              break;
-              }
-            case NUMERIC:{
-              word = jj_consume_token(NUMERIC);
-              break;
-              }
-            default:
-              jj_la1[48] = jj_gen;
-              jj_consume_token(-1);
-              throw new ParseException();
-            }
-records.add(word.image);
-          }
-          jj_consume_token(CLOSE_BRACKET);
+        case COMMA:{
           jj_consume_token(COMMA);
           timestamp = Timestamp();
           jj_consume_token(CLOSE_PARENTHESES);
-{if ("" != null) return new FunctionValueSymbol(new KeyRecordsFunction(function.image, key.image, records, timestamp.timestamp()));}
-          break;
-          }
-        default:
-          jj_la1[49] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case SIGNED_INTEGER:
-        case SIGNED_DECIMAL:
-        case ALPHANUMERIC:
-        case PERIOD_SEPARATED_STRING:{
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case SIGNED_INTEGER:{
-            key = jj_consume_token(SIGNED_INTEGER);
-            break;
-            }
-          case SIGNED_DECIMAL:{
-            key = jj_consume_token(SIGNED_DECIMAL);
-            break;
-            }
-          case ALPHANUMERIC:{
-            key = jj_consume_token(ALPHANUMERIC);
-            break;
-            }
-          case PERIOD_SEPARATED_STRING:{
-            key = jj_consume_token(PERIOD_SEPARATED_STRING);
-            break;
-            }
-          default:
-            jj_la1[50] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
-          }
-          jj_consume_token(COMMA);
-          ccl = generateSubAST();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case CLOSE_PARENTHESES:{
-            jj_consume_token(CLOSE_PARENTHESES);
-ConditionTree tree = (ConditionTree) ccl.jjtAccept(visitor, null);
-          {if ("" != null) return new FunctionValueSymbol(new KeyConditionFunction(function.image, key.image, tree));}
-            break;
-            }
-          case COMMA:{
-            jj_consume_token(COMMA);
-            timestamp = Timestamp();
-            jj_consume_token(CLOSE_PARENTHESES);
 ConditionTree tree = (ConditionTree) ccl.jjtAccept(visitor, null);
           {if ("" != null) return new FunctionValueSymbol(new KeyConditionFunction(function.image, key.image, tree, timestamp.timestamp()));}
-            break;
-            }
-          default:
-            jj_la1[51] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
-          }
           break;
           }
         default:
-          jj_la1[52] = jj_gen;
+          jj_la1[53] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
-      }
-    throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("ValueFunction");
-    }
-}
-
-  final public void Command() throws ParseException {
-    trace_call("Command");
-    try {
-
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ADD:
-      case SET:
-      case REMOVE:
-      case CLEAR:
-      case VERIFY_AND_SWAP:
-      case VERIFY_OR_SET:{
-        DataModificationOperations();
-        break;
-        }
-      case INSERT:{
-        RecordOperations();
-        break;
-        }
-      case LINK:
-      case UNLINK:{
-        LinkOperations();
-        break;
-        }
-      case SELECT:
-      case FETCH:
-      case GET:
-      case DESCRIBE:
-      case AUDIT:
-      case VERIFY:
-      case SEARCH:{
-        QueryOperations();
-        break;
-        }
-      case STAGE:
-      case COMMIT:
-      case ABORT:{
-        TransactionOperations();
-        break;
-        }
-      case REVERT:{
-        RevertCommand();
         break;
         }
       default:
-        jj_la1[53] = jj_gen;
+        jj_la1[54] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-    } finally {
-      trace_return("Command");
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void DataModificationOperations() throws ParseException {
-    trace_call("DataModificationOperations");
-    try {
+  final public void Command() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ADD:
+    case SET:
+    case REMOVE:
+    case CLEAR:
+    case VERIFY_AND_SWAP:
+    case VERIFY_OR_SET:{
+      DataModificationOperations();
+      break;
+      }
+    case INSERT:{
+      RecordOperations();
+      break;
+      }
+    case LINK:
+    case UNLINK:{
+      LinkOperations();
+      break;
+      }
+    case SELECT:
+    case FETCH:
+    case GET:
+    case DESCRIBE:
+    case AUDIT:
+    case VERIFY:
+    case SEARCH:{
+      QueryOperations();
+      break;
+      }
+    case STAGE:
+    case COMMIT:
+    case ABORT:{
+      TransactionOperations();
+      break;
+      }
+    case REVERT:{
+      RevertCommand();
+      break;
+      }
+    default:
+      jj_la1[55] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+}
 
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case ADD:{
-        AddCommand();
-        break;
-        }
-      case SET:{
-        SetCommand();
-        break;
-        }
-      case REMOVE:{
-        RemoveCommand();
-        break;
-        }
-      case CLEAR:{
-        ClearCommand();
-        break;
-        }
-      case VERIFY_AND_SWAP:{
-        VerifyAndSwapCommand();
-        break;
-        }
-      case VERIFY_OR_SET:{
-        VerifyOrSetCommand();
-        break;
-        }
-      default:
-        jj_la1[54] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+  final public void DataModificationOperations() throws ParseException {
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ADD:{
+      AddCommand();
+      break;
       }
-    } finally {
-      trace_return("DataModificationOperations");
+    case SET:{
+      SetCommand();
+      break;
+      }
+    case REMOVE:{
+      RemoveCommand();
+      break;
+      }
+    case CLEAR:{
+      ClearCommand();
+      break;
+      }
+    case VERIFY_AND_SWAP:{
+      VerifyAndSwapCommand();
+      break;
+      }
+    case VERIFY_OR_SET:{
+      VerifyOrSetCommand();
+      break;
+      }
+    default:
+      jj_la1[56] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
 }
 
-  final public void AddCommand() throws ParseException {
-    trace_call("AddCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void AddCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
-      try {
-        jj_consume_token(ADD);
-        key = Key();
-        jj_consume_token(AS);
-        value = UnaryValue();
-        jj_consume_token(IN);
-        record = jj_consume_token(NUMERIC);
+    try {
+      jj_consume_token(ADD);
+      key = Key();
+      jj_consume_token(AS);
+      value = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new AddSymbol(key, value, Long.parseLong(record.image)));
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1848,36 +1721,30 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("AddCommand");
     }
 }
 
-  final public void SetCommand() throws ParseException {
-    trace_call("SetCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void SetCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
-      try {
-        jj_consume_token(SET);
-        key = Key();
-        jj_consume_token(AS);
-        value = UnaryValue();
-        jj_consume_token(IN);
-        record = jj_consume_token(NUMERIC);
+    try {
+      jj_consume_token(SET);
+      key = Key();
+      jj_consume_token(AS);
+      value = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new SetSymbol(key, value, Long.parseLong(record.image)));
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1891,57 +1758,51 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("SetCommand");
     }
 }
 
-  final public void RemoveCommand() throws ParseException {
-    trace_call("RemoveCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void RemoveCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value = null;
     Token record;
-      try {
-        jj_consume_token(REMOVE);
-        key = Key();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case AS:{
-          jj_consume_token(AS);
-          value = UnaryValue();
-          break;
-          }
-        default:
-          jj_la1[55] = jj_gen;
-          ;
+    try {
+      jj_consume_token(REMOVE);
+      key = Key();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case AS:{
+        jj_consume_token(AS);
+        value = UnaryValue();
+        break;
         }
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case FROM:{
-          jj_consume_token(FROM);
-          break;
-          }
-        case IN:{
-          jj_consume_token(IN);
-          break;
-          }
-        default:
-          jj_la1[56] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+      default:
+        jj_la1[57] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case FROM:{
+        jj_consume_token(FROM);
+        break;
         }
-        record = jj_consume_token(NUMERIC);
+      case IN:{
+        jj_consume_token(IN);
+        break;
+        }
+      default:
+        jj_la1[58] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+      record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new RemoveSymbol(key, value, Long.parseLong(record.image)));
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -1955,67 +1816,61 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("RemoveCommand");
     }
 }
 
-  final public void ClearCommand() throws ParseException {
-    trace_call("ClearCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void ClearCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
     Token record;
     Collection<KeyTokenSymbol<?>> keys = null;
     Collection records = null;
-      try {
-        jj_consume_token(CLEAR);
-        if (jj_2_15(3)) {
-          key = Key();
-          jj_consume_token(FROM);
-          record = jj_consume_token(NUMERIC);
+    try {
+      jj_consume_token(CLEAR);
+      if (jj_2_13(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(key, Long.parseLong(record.image)));
-        } else if (jj_2_16(3)) {
-          key = Key();
-          jj_consume_token(FROM);
-          records = RecordCollection();
+      } else if (jj_2_14(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        records = RecordCollection();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(key, records));
-        } else if (jj_2_17(3)) {
-          keys = KeyCollection();
-          jj_consume_token(FROM);
-          record = jj_consume_token(NUMERIC);
+      } else if (jj_2_15(3)) {
+        keys = KeyCollection();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(keys, Long.parseLong(record.image)));
-        } else {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case OPEN_BRACKET:{
-            keys = KeyCollection();
-            jj_consume_token(FROM);
-            records = RecordCollection();
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
+          keys = KeyCollection();
+          jj_consume_token(FROM);
+          records = RecordCollection();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(keys, records));
-            break;
-            }
-          default:
-            jj_la1[57] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+          break;
           }
+        default:
+          jj_la1[59] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      } catch (Throwable jjte000) {
+      }
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2029,39 +1884,33 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("ClearCommand");
     }
 }
 
-  final public void VerifyAndSwapCommand() throws ParseException {
-    trace_call("VerifyAndSwapCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void VerifyAndSwapCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> expected;
     ValueTokenSymbol<?> replacement;
     Token record;
-      try {
-        jj_consume_token(VERIFY_AND_SWAP);
-        key = Key();
-        jj_consume_token(AS);
-        expected = UnaryValue();
-        jj_consume_token(IN);
-        record = jj_consume_token(NUMERIC);
-        jj_consume_token(WITH);
-        replacement = UnaryValue();
+    try {
+      jj_consume_token(VERIFY_AND_SWAP);
+      key = Key();
+      jj_consume_token(AS);
+      expected = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
+      jj_consume_token(WITH);
+      replacement = UnaryValue();
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new VerifyAndSwapSymbol(key, expected, replacement, Long.parseLong(record.image)));
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2075,36 +1924,30 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("VerifyAndSwapCommand");
     }
 }
 
-  final public void VerifyOrSetCommand() throws ParseException {
-    trace_call("VerifyOrSetCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void VerifyOrSetCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
-      try {
-        jj_consume_token(VERIFY_OR_SET);
-        key = Key();
-        jj_consume_token(AS);
-        value = UnaryValue();
-        jj_consume_token(IN);
-        record = jj_consume_token(NUMERIC);
+    try {
+      jj_consume_token(VERIFY_OR_SET);
+      key = Key();
+      jj_consume_token(AS);
+      value = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new VerifyOrSetSymbol(key, value, Long.parseLong(record.image)));
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2118,83 +1961,71 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("VerifyOrSetCommand");
     }
 }
 
   final public void RecordOperations() throws ParseException {
-    trace_call("RecordOperations");
-    try {
-
-      InsertCommand();
-    } finally {
-      trace_return("RecordOperations");
-    }
+    InsertCommand();
 }
 
-  final public void InsertCommand() throws ParseException {
-    trace_call("InsertCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void InsertCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);String json;
     Token record = null;
     Collection records = null;
-      try {
-        jj_consume_token(INSERT);
-        json = JsonObject();
+    try {
+      jj_consume_token(INSERT);
+      json = JsonObject();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case INTO:{
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
+        case IN:{
+          jj_consume_token(IN);
+          break;
+          }
         case INTO:{
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:{
-            jj_consume_token(IN);
-            break;
-            }
-          case INTO:{
-            jj_consume_token(INTO);
-            break;
-            }
-          default:
-            jj_la1[58] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+          jj_consume_token(INTO);
+          break;
           }
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case NUMERIC:{
-            record = jj_consume_token(NUMERIC);
+        default:
+          jj_la1[60] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
+        }
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case NUMERIC:{
+          record = jj_consume_token(NUMERIC);
 jjtn000.command(new InsertSymbol(json, Long.parseLong(record.image)));
-            break;
-            }
-          case OPEN_BRACKET:{
-            records = RecordCollection();
-jjtn000.command(new InsertSymbol(json, records));
-            break;
-            }
-          default:
-            jj_la1[59] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+          break;
           }
+        case OPEN_BRACKET:{
+          records = RecordCollection();
+jjtn000.command(new InsertSymbol(json, records));
           break;
           }
         default:
-          jj_la1[60] = jj_gen;
-          ;
+          jj_la1[61] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
+        break;
+        }
+      default:
+        jj_la1[62] = jj_gen;
+        ;
+      }
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 if(record == null && records == null) {
             jjtn000.command(new InsertSymbol(json));
         }
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2208,78 +2039,66 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("InsertCommand");
     }
 }
 
   final public void LinkOperations() throws ParseException {
-    trace_call("LinkOperations");
-    try {
-
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case LINK:{
-        LinkCommand();
-        break;
-        }
-      case UNLINK:{
-        UnlinkCommand();
-        break;
-        }
-      default:
-        jj_la1[61] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case LINK:{
+      LinkCommand();
+      break;
       }
-    } finally {
-      trace_return("LinkOperations");
+    case UNLINK:{
+      UnlinkCommand();
+      break;
+      }
+    default:
+      jj_la1[63] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
 }
 
-  final public void LinkCommand() throws ParseException {
-    trace_call("LinkCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void LinkCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
-      try {
-        jj_consume_token(LINK);
-        key = Key();
-        jj_consume_token(FROM);
-        source = jj_consume_token(NUMERIC);
-        jj_consume_token(TO);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case NUMERIC:{
-          destination = jj_consume_token(NUMERIC);
+    try {
+      jj_consume_token(LINK);
+      key = Key();
+      jj_consume_token(FROM);
+      source = jj_consume_token(NUMERIC);
+      jj_consume_token(TO);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMERIC:{
+        destination = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 Collection dest = new ArrayList();
             dest.add(Long.parseLong(destination.image));
             jjtn000.command(new LinkSymbol(key, Long.parseLong(source.image), dest));
-          break;
-          }
-        case OPEN_BRACKET:{
-          destinations = RecordCollection();
+        break;
+        }
+      case OPEN_BRACKET:{
+        destinations = RecordCollection();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new LinkSymbol(key, Long.parseLong(source.image), destinations));
-          break;
-          }
-        default:
-          jj_la1[62] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+        break;
         }
-      } catch (Throwable jjte000) {
+      default:
+        jj_la1[64] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2293,55 +2112,49 @@ final public void LinkCommand() throws ParseException {
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("LinkCommand");
     }
 }
 
-  final public void UnlinkCommand() throws ParseException {
-    trace_call("UnlinkCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void UnlinkCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
-      try {
-        jj_consume_token(UNLINK);
-        key = Key();
-        jj_consume_token(FROM);
-        source = jj_consume_token(NUMERIC);
-        jj_consume_token(TO);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case NUMERIC:{
-          destination = jj_consume_token(NUMERIC);
+    try {
+      jj_consume_token(UNLINK);
+      key = Key();
+      jj_consume_token(FROM);
+      source = jj_consume_token(NUMERIC);
+      jj_consume_token(TO);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMERIC:{
+        destination = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 Collection dest = new ArrayList();
             dest.add(Long.parseLong(destination.image));
             jjtn000.command(new UnlinkSymbol(key, Long.parseLong(source.image), dest));
-          break;
-          }
-        case OPEN_BRACKET:{
-          destinations = RecordCollection();
+        break;
+        }
+      case OPEN_BRACKET:{
+        destinations = RecordCollection();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new UnlinkSymbol(key, Long.parseLong(source.image), destinations));
-          break;
-          }
-        default:
-          jj_la1[63] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+        break;
         }
-      } catch (Throwable jjte000) {
+      default:
+        jj_la1[65] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2355,87 +2168,75 @@ final public void UnlinkCommand() throws ParseException {
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("UnlinkCommand");
     }
 }
 
   final public void QueryOperations() throws ParseException {
-    trace_call("QueryOperations");
-    try {
-
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case SELECT:{
-        SelectCommand();
-        break;
-        }
-      case FETCH:{
-        FetchCommand();
-        break;
-        }
-      case GET:{
-        GetCommand();
-        break;
-        }
-      case DESCRIBE:{
-        DescribeCommand();
-        break;
-        }
-      case AUDIT:{
-        AuditCommand();
-        break;
-        }
-      case VERIFY:{
-        VerifyCommand();
-        break;
-        }
-      case SEARCH:{
-        SearchCommand();
-        break;
-        }
-      default:
-        jj_la1[64] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case SELECT:{
+      SelectCommand();
+      break;
       }
-    } finally {
-      trace_return("QueryOperations");
+    case FETCH:{
+      FetchCommand();
+      break;
+      }
+    case GET:{
+      GetCommand();
+      break;
+      }
+    case DESCRIBE:{
+      DescribeCommand();
+      break;
+      }
+    case AUDIT:{
+      AuditCommand();
+      break;
+      }
+    case VERIFY:{
+      VerifyCommand();
+      break;
+      }
+    case SEARCH:{
+      SearchCommand();
+      break;
+      }
+    default:
+      jj_la1[66] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
 }
 
-  final public void SelectCommand() throws ParseException {
-    trace_call("SelectCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void SelectCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token record;
     TimestampSymbol timestamp = null;
-      try {
-        jj_consume_token(SELECT);
-        key = Key();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case TIMESTAMP:{
-          timestamp = Timestamp();
-          break;
-          }
-        default:
-          jj_la1[65] = jj_gen;
-          ;
+    try {
+      jj_consume_token(SELECT);
+      key = Key();
+      jj_consume_token(FROM);
+      record = jj_consume_token(NUMERIC);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case TIMESTAMP:{
+        timestamp = Timestamp();
+        break;
         }
+      default:
+        jj_la1[67] = jj_gen;
+        ;
+      }
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new SelectSymbol(key, Long.parseLong(record.image), timestamp));
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2449,20 +2250,14 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("SelectCommand");
     }
 }
 
-  final public void FetchCommand() throws ParseException {
-    trace_call("FetchCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void FetchCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
@@ -2470,46 +2265,65 @@ final public void FetchCommand() throws ParseException {
     Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
-      try {
-        jj_consume_token(FETCH);
-        if (jj_2_18(3)) {
-          key = Key();
-          jj_consume_token(FROM);
-          record = jj_consume_token(NUMERIC);
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:
-          case TIMESTAMP:{
-            timestamp = Timestamp();
-            break;
-            }
-          default:
-            jj_la1[66] = jj_gen;
-            ;
+    try {
+      jj_consume_token(FETCH);
+      if (jj_2_16(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
+          break;
           }
+        default:
+          jj_la1[68] = jj_gen;
+          ;
+        }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new FetchSymbol(key, Long.parseLong(record.image), timestamp));
-        } else if (jj_2_19(3)) {
-          key = Key();
-          jj_consume_token(FROM);
-          records = RecordCollection();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:
-          case TIMESTAMP:{
-            timestamp = Timestamp();
-            break;
-            }
-          default:
-            jj_la1[67] = jj_gen;
-            ;
+      } else if (jj_2_17(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        records = RecordCollection();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
+          break;
           }
+        default:
+          jj_la1[69] = jj_gen;
+          ;
+        }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new FetchSymbol(key, records, timestamp));
-        } else if (jj_2_20(3)) {
+      } else if (jj_2_18(3)) {
+        keys = KeyCollection();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
+          break;
+          }
+        default:
+          jj_la1[70] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
           keys = KeyCollection();
           jj_consume_token(FROM);
-          record = jj_consume_token(NUMERIC);
+          records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case IN:
           case TIMESTAMP:{
@@ -2517,40 +2331,21 @@ record = jj_consume_token(NUMERIC);
             break;
             }
           default:
-            jj_la1[68] = jj_gen;
+            jj_la1[71] = jj_gen;
             ;
           }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
-jjtn000.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
-        } else {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case OPEN_BRACKET:{
-            keys = KeyCollection();
-            jj_consume_token(FROM);
-            records = RecordCollection();
-            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case IN:
-            case TIMESTAMP:{
-              timestamp = Timestamp();
-              break;
-              }
-            default:
-              jj_la1[69] = jj_gen;
-              ;
-            }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
 jjtn000.command(new FetchSymbol(keys, records, timestamp));
-            break;
-            }
-          default:
-            jj_la1[70] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+          break;
           }
+        default:
+          jj_la1[72] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      } catch (Throwable jjte000) {
+      }
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2564,20 +2359,14 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("FetchCommand");
     }
 }
 
-  final public void GetCommand() throws ParseException {
-    trace_call("GetCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void GetCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
@@ -2585,46 +2374,65 @@ final public void GetCommand() throws ParseException {
     Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
-      try {
-        jj_consume_token(GET);
-        if (jj_2_21(3)) {
-          key = Key();
-          jj_consume_token(FROM);
-          record = jj_consume_token(NUMERIC);
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:
-          case TIMESTAMP:{
-            timestamp = Timestamp();
-            break;
-            }
-          default:
-            jj_la1[71] = jj_gen;
-            ;
+    try {
+      jj_consume_token(GET);
+      if (jj_2_19(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
+          break;
           }
+        default:
+          jj_la1[73] = jj_gen;
+          ;
+        }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new GetSymbol(key, Long.parseLong(record.image), timestamp));
-        } else if (jj_2_22(3)) {
-          key = Key();
-          jj_consume_token(FROM);
-          records = RecordCollection();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:
-          case TIMESTAMP:{
-            timestamp = Timestamp();
-            break;
-            }
-          default:
-            jj_la1[72] = jj_gen;
-            ;
+      } else if (jj_2_20(3)) {
+        key = Key();
+        jj_consume_token(FROM);
+        records = RecordCollection();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
+          break;
           }
+        default:
+          jj_la1[74] = jj_gen;
+          ;
+        }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new GetSymbol(key, records, timestamp));
-        } else if (jj_2_23(3)) {
+      } else if (jj_2_21(3)) {
+        keys = KeyCollection();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
+          break;
+          }
+        default:
+          jj_la1[75] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
           keys = KeyCollection();
           jj_consume_token(FROM);
-          record = jj_consume_token(NUMERIC);
+          records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case IN:
           case TIMESTAMP:{
@@ -2632,40 +2440,21 @@ record = jj_consume_token(NUMERIC);
             break;
             }
           default:
-            jj_la1[73] = jj_gen;
+            jj_la1[76] = jj_gen;
             ;
           }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
-jjtn000.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
-        } else {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case OPEN_BRACKET:{
-            keys = KeyCollection();
-            jj_consume_token(FROM);
-            records = RecordCollection();
-            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case IN:
-            case TIMESTAMP:{
-              timestamp = Timestamp();
-              break;
-              }
-            default:
-              jj_la1[74] = jj_gen;
-              ;
-            }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
 jjtn000.command(new GetSymbol(keys, records, timestamp));
-            break;
-            }
-          default:
-            jj_la1[75] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+          break;
           }
+        default:
+          jj_la1[77] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      } catch (Throwable jjte000) {
+      }
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2679,29 +2468,40 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("GetCommand");
     }
 }
 
-  final public void DescribeCommand() throws ParseException {
-    trace_call("DescribeCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void DescribeCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);Token record;
     Collection records = null;
     TimestampSymbol timestamp = null;
-      try {
-        jj_consume_token(DESCRIBE);
-        if (jj_2_24(2)) {
-          record = jj_consume_token(NUMERIC);
+    try {
+      jj_consume_token(DESCRIBE);
+      if (jj_2_22(2)) {
+        record = jj_consume_token(NUMERIC);
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case TIMESTAMP:{
+          timestamp = Timestamp();
+          break;
+          }
+        default:
+          jj_la1[78] = jj_gen;
+          ;
+        }
+jjtree.closeNodeScope(jjtn000, true);
+          jjtc000 = false;
+jjtn000.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
+          records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case IN:
           case TIMESTAMP:{
@@ -2709,38 +2509,21 @@ record = jj_consume_token(NUMERIC);
             break;
             }
           default:
-            jj_la1[76] = jj_gen;
+            jj_la1[79] = jj_gen;
             ;
           }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
-jjtn000.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
-        } else {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case OPEN_BRACKET:{
-            records = RecordCollection();
-            switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-            case IN:
-            case TIMESTAMP:{
-              timestamp = Timestamp();
-              break;
-              }
-            default:
-              jj_la1[77] = jj_gen;
-              ;
-            }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
 jjtn000.command(new DescribeSymbol(records, timestamp));
-            break;
-            }
-          default:
-            jj_la1[78] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+          break;
           }
+        default:
+          jj_la1[80] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      } catch (Throwable jjte000) {
+      }
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2754,49 +2537,43 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("DescribeCommand");
     }
 }
 
-  final public void AuditCommand() throws ParseException {
-    trace_call("AuditCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void AuditCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
     Token record;
-      try {
-        jj_consume_token(AUDIT);
-        if (jj_2_25(2)) {
-          key = Key();
-          jj_consume_token(FROM);
-          record = jj_consume_token(NUMERIC);
+    try {
+      jj_consume_token(AUDIT);
+      if (jj_2_23(2)) {
+        key = Key();
+        jj_consume_token(FROM);
+        record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new AuditSymbol(key, Long.parseLong(record.image)));
-        } else {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case NUMERIC:{
-            record = jj_consume_token(NUMERIC);
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case NUMERIC:{
+          record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new AuditSymbol(null, Long.parseLong(record.image)));
-            break;
-            }
-          default:
-            jj_la1[79] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+          break;
           }
+        default:
+          jj_la1[81] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      } catch (Throwable jjte000) {
+      }
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2810,47 +2587,41 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("AuditCommand");
     }
 }
 
-  final public void VerifyCommand() throws ParseException {
-    trace_call("VerifyCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void VerifyCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
     TimestampSymbol timestamp = null;
-      try {
-        jj_consume_token(VERIFY);
-        key = Key();
-        jj_consume_token(AS);
-        value = UnaryValue();
-        jj_consume_token(IN);
-        record = jj_consume_token(NUMERIC);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case TIMESTAMP:{
-          timestamp = Timestamp();
-          break;
-          }
-        default:
-          jj_la1[80] = jj_gen;
-          ;
+    try {
+      jj_consume_token(VERIFY);
+      key = Key();
+      jj_consume_token(AS);
+      value = UnaryValue();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case TIMESTAMP:{
+        timestamp = Timestamp();
+        break;
         }
+      default:
+        jj_la1[82] = jj_gen;
+        ;
+      }
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new VerifySymbol(key, value, Long.parseLong(record.image), timestamp));
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2864,33 +2635,27 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("VerifyCommand");
     }
 }
 
-  final public void SearchCommand() throws ParseException {
-    trace_call("SearchCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void SearchCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
     Token query;
-      try {
-        jj_consume_token(SEARCH);
-        key = Key();
-        jj_consume_token(FOR);
-        query = jj_consume_token(QUOTED_STRING);
+    try {
+      jj_consume_token(SEARCH);
+      key = Key();
+      jj_consume_token(FOR);
+      query = jj_consume_token(QUOTED_STRING);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(new SearchSymbol(key, query.image));
-      } catch (Throwable jjte000) {
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -2904,113 +2669,83 @@ final public void SearchCommand() throws ParseException {
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("SearchCommand");
     }
 }
 
   final public void TransactionOperations() throws ParseException {
-    trace_call("TransactionOperations");
-    try {
-
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case STAGE:{
-        StageCommand();
-        break;
-        }
-      case COMMIT:{
-        CommitCommand();
-        break;
-        }
-      case ABORT:{
-        AbortCommand();
-        break;
-        }
-      default:
-        jj_la1[81] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case STAGE:{
+      StageCommand();
+      break;
       }
-    } finally {
-      trace_return("TransactionOperations");
+    case COMMIT:{
+      CommitCommand();
+      break;
+      }
+    case ABORT:{
+      AbortCommand();
+      break;
+      }
+    default:
+      jj_la1[83] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
 }
 
-  final public void StageCommand() throws ParseException {
-    trace_call("StageCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void StageCommand() throws ParseException {/*@bgen(jjtree) Command */
   ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-      try {
-        jj_consume_token(STAGE);
+    try {
+      jj_consume_token(STAGE);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(StageSymbol.INSTANCE);
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("StageCommand");
     }
 }
 
-  final public void CommitCommand() throws ParseException {
-    trace_call("CommitCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void CommitCommand() throws ParseException {/*@bgen(jjtree) Command */
   ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-      try {
-        jj_consume_token(COMMIT);
+    try {
+      jj_consume_token(COMMIT);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(CommitSymbol.INSTANCE);
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("CommitCommand");
     }
 }
 
-  final public void AbortCommand() throws ParseException {
-    trace_call("AbortCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void AbortCommand() throws ParseException {/*@bgen(jjtree) Command */
   ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
   boolean jjtc000 = true;
   jjtree.openNodeScope(jjtn000);
-      try {
-        jj_consume_token(ABORT);
+    try {
+      jj_consume_token(ABORT);
 jjtree.closeNodeScope(jjtn000, true);
       jjtc000 = false;
 jjtn000.command(AbortSymbol.INSTANCE);
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("AbortCommand");
     }
 }
 
-  final public void RevertCommand() throws ParseException {
-    trace_call("RevertCommand");
-    try {
-/*@bgen(jjtree) Command */
+  final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command */
     ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
@@ -3018,51 +2753,51 @@ final public void RevertCommand() throws ParseException {
     Collection<KeyTokenSymbol<?>> keys = null;
     Collection<Long> records = null;
     TimestampSymbol timestamp;
-      try {
-        jj_consume_token(REVERT);
-        if (jj_2_26(3)) {
-          key = Key();
-          jj_consume_token(IN);
-          record = jj_consume_token(NUMERIC);
-          timestamp = Timestamp();
+    try {
+      jj_consume_token(REVERT);
+      if (jj_2_24(3)) {
+        key = Key();
+        jj_consume_token(IN);
+        record = jj_consume_token(NUMERIC);
+        timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(key, Long.parseLong(record.image), timestamp));
-        } else if (jj_2_27(3)) {
-          key = Key();
-          jj_consume_token(IN);
-          records = RecordCollection();
-          timestamp = Timestamp();
+      } else if (jj_2_25(3)) {
+        key = Key();
+        jj_consume_token(IN);
+        records = RecordCollection();
+        timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(key, records, timestamp));
-        } else if (jj_2_28(3)) {
-          keys = KeyCollection();
-          jj_consume_token(IN);
-          record = jj_consume_token(NUMERIC);
-          timestamp = Timestamp();
+      } else if (jj_2_26(3)) {
+        keys = KeyCollection();
+        jj_consume_token(IN);
+        record = jj_consume_token(NUMERIC);
+        timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
-        } else {
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case OPEN_BRACKET:{
-            keys = KeyCollection();
-            jj_consume_token(IN);
-            records = RecordCollection();
-            timestamp = Timestamp();
+      } else {
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case OPEN_BRACKET:{
+          keys = KeyCollection();
+          jj_consume_token(IN);
+          records = RecordCollection();
+          timestamp = Timestamp();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(keys, records, timestamp));
-            break;
-            }
-          default:
-            jj_la1[82] = jj_gen;
-            jj_consume_token(-1);
-            throw new ParseException();
+          break;
           }
+        default:
+          jj_la1[84] = jj_gen;
+          jj_consume_token(-1);
+          throw new ParseException();
         }
-      } catch (Throwable jjte000) {
+      }
+    } catch (Throwable jjte000) {
 if (jjtc000) {
         jjtree.clearNodeScope(jjtn000);
         jjtc000 = false;
@@ -3076,89 +2811,68 @@ record = jj_consume_token(NUMERIC);
         {if (true) throw (ParseException)jjte000;}
       }
       {if (true) throw (Error)jjte000;}
-      } finally {
+    } finally {
 if (jjtc000) {
         jjtree.closeNodeScope(jjtn000, true);
       }
-      }
-    } finally {
-      trace_return("RevertCommand");
     }
 }
 
 // Utility parsing rules
-  final public Collection RecordCollection() throws ParseException {
-    trace_call("RecordCollection");
-    try {
-Token record;
+  final public Collection RecordCollection() throws ParseException {Token record;
     Collection records = new ArrayList();
-      jj_consume_token(OPEN_BRACKET);
-      record = jj_consume_token(NUMERIC);
+    jj_consume_token(OPEN_BRACKET);
+    record = jj_consume_token(NUMERIC);
 records.add(Long.parseLong(record.image));
-      label_10:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case COMMA:{
-          ;
-          break;
-          }
-        default:
-          jj_la1[83] = jj_gen;
-          break label_10;
+    label_10:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
         }
-        jj_consume_token(COMMA);
-        record = jj_consume_token(NUMERIC);
-records.add(Long.parseLong(record.image));
+      default:
+        jj_la1[85] = jj_gen;
+        break label_10;
       }
-      jj_consume_token(CLOSE_BRACKET);
+      jj_consume_token(COMMA);
+      record = jj_consume_token(NUMERIC);
+records.add(Long.parseLong(record.image));
+    }
+    jj_consume_token(CLOSE_BRACKET);
 {if ("" != null) return records;}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("RecordCollection");
-    }
 }
 
-  final public Collection KeyCollection() throws ParseException {
-    trace_call("KeyCollection");
-    try {
-KeyTokenSymbol key;
+  final public Collection KeyCollection() throws ParseException {KeyTokenSymbol key;
     Collection keys = new ArrayList();
-      jj_consume_token(OPEN_BRACKET);
-      key = Key();
+    jj_consume_token(OPEN_BRACKET);
+    key = Key();
 keys.add(key.toString());
-      label_11:
-      while (true) {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case COMMA:{
-          ;
-          break;
-          }
-        default:
-          jj_la1[84] = jj_gen;
-          break label_11;
+    label_11:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
         }
-        jj_consume_token(COMMA);
-        key = Key();
-keys.add(key.toString());
+      default:
+        jj_la1[86] = jj_gen;
+        break label_11;
       }
-      jj_consume_token(CLOSE_BRACKET);
+      jj_consume_token(COMMA);
+      key = Key();
+keys.add(key.toString());
+    }
+    jj_consume_token(CLOSE_BRACKET);
 {if ("" != null) return keys;}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("KeyCollection");
-    }
 }
 
-  final public String JsonObject() throws ParseException {
-    trace_call("JsonObject");
-    try {
-Token content;
-      content = jj_consume_token(QUOTED_STRING);
+  final public String JsonObject() throws ParseException {Token content;
+    content = jj_consume_token(QUOTED_STRING);
 {if ("" != null) return content.image;}
     throw new Error("Missing return statement in function");
-    } finally {
-      trace_return("JsonObject");
-    }
 }
 
   private boolean jj_2_1(int xla)
@@ -3356,169 +3070,23 @@ private boolean jj_2_24(int xla)
   private boolean jj_2_25(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_25()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(24, xla); }
-  }
-
-  private boolean jj_2_26(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_26()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(25, xla); }
-  }
-
-  private boolean jj_2_27(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_27()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(26, xla); }
-  }
-
-  private boolean jj_2_28(int xla)
- {
-    jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_28()); }
-    catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(27, xla); }
-  }
-
-  private boolean jj_3R_46()
- {
-    if (jj_3R_68()) return true;
-    return false;
-  }
-
-  private boolean jj_3_6()
- {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(67)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) return true;
-    }
-    }
-    }
-    }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_45()
- {
-    if (jj_3R_67()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_98()
- {
-    Token xsp;
-    if (jj_3_6()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_6()) { jj_scanpos = xsp; break; }
-    }
-    return false;
-  }
-
-  private boolean jj_3R_81()
- {
-    if (!jj_rescan) trace_call("StageCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(STAGE)) { if (!jj_rescan) trace_return("StageCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("StageCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_44()
- {
-    if (jj_3R_66()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_43()
- {
-    if (jj_3R_65()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_85()
- {
-    if (!jj_rescan) trace_call("UnaryValue(LOOKING AHEAD...)");
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_7()) {
-    jj_scanpos = xsp;
-    if (jj_3R_98()) {
-    jj_scanpos = xsp;
-    if (jj_3R_99()) { if (!jj_rescan) trace_return("UnaryValue(LOOKAHEAD FAILED)"); return true; }
-    }
-    }
-    { if (!jj_rescan) trace_return("UnaryValue(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_60()
- {
-    if (jj_3R_83()) return true;
-    return false;
-  }
-
-  private boolean jj_3_7()
- {
-    if (jj_3R_15()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_35()
- {
-    if (!jj_rescan) trace_call("DataModificationOperations(LOOKING AHEAD...)");
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_42()) {
-    jj_scanpos = xsp;
-    if (jj_3R_43()) {
-    jj_scanpos = xsp;
-    if (jj_3R_44()) {
-    jj_scanpos = xsp;
-    if (jj_3R_45()) {
-    jj_scanpos = xsp;
-    if (jj_3R_46()) {
-    jj_scanpos = xsp;
-    if (jj_3R_47()) { if (!jj_rescan) trace_return("DataModificationOperations(LOOKAHEAD FAILED)"); return true; }
-    }
-    }
-    }
-    }
-    }
-    { if (!jj_rescan) trace_return("DataModificationOperations(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_42()
- {
-    if (jj_3R_64()) return true;
-    return false;
+    try { return (!jj_3_25()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(24, xla); }
   }
 
-  private boolean jj_3R_59()
+  private boolean jj_2_26(int xla)
  {
-    if (jj_3R_82()) return true;
-    return false;
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_26()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(25, xla); }
   }
 
-  private boolean jj_3_11()
+  private boolean jj_3_4()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(64)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(69)) {
     jj_scanpos = xsp;
     if (jj_scan_token(70)) {
@@ -3527,7 +3095,9 @@ private boolean jj_3_11()
     jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
+    if (jj_scan_token(73)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) return true;
     }
     }
     }
@@ -3536,75 +3106,76 @@ private boolean jj_3_11()
     return false;
   }
 
-  private boolean jj_3R_73()
- {
-    if (!jj_rescan) trace_call("UnlinkCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(UNLINK)) { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(FROM)) { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("UnlinkCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_29()
- {
-    if (jj_3R_40()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_58()
+  private boolean jj_3R_62()
  {
-    if (jj_3R_81()) return true;
+    Token xsp;
+    if (jj_3_4()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_4()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_39()
+  private boolean jj_3R_55()
  {
-    if (!jj_rescan) trace_call("TransactionOperations(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_58()) {
+    if (jj_3_5()) {
     jj_scanpos = xsp;
-    if (jj_3R_59()) {
+    if (jj_3R_62()) {
     jj_scanpos = xsp;
-    if (jj_3R_60()) { if (!jj_rescan) trace_return("TransactionOperations(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_63()) return true;
     }
     }
-    { if (!jj_rescan) trace_return("TransactionOperations(LOOKAHEAD SUCCEEDED)"); return false; }
+    return false;
   }
 
-  private boolean jj_3R_28()
+  private boolean jj_3_5()
  {
-    if (jj_3R_39()) return true;
+    if (jj_3R_18()) return true;
     return false;
   }
 
-  private boolean jj_3R_27()
+  private boolean jj_3R_41()
  {
-    if (jj_3R_38()) return true;
+    if (jj_scan_token(PAGE)) return true;
     return false;
   }
 
-  private boolean jj_3R_26()
+  private boolean jj_3_9()
  {
-    if (jj_3R_37()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(64)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(69)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(67)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_25()
+  private boolean jj_3R_38()
  {
-    if (jj_3R_36()) return true;
+    if (jj_3R_42()) return true;
     return false;
   }
 
-  private boolean jj_3R_80()
+  private boolean jj_3R_37()
  {
-    if (!jj_rescan) trace_call("SearchCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(SEARCH)) { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(FOR)) { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(QUOTED_STRING)) { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("SearchCommand(LOOKAHEAD SUCCEEDED)"); return false; }
+    if (jj_3R_41()) return true;
+    return false;
   }
 
   private boolean jj_3R_33()
@@ -3613,33 +3184,14 @@ private boolean jj_3R_33()
     return false;
   }
 
-  private boolean jj_3R_12()
+  private boolean jj_3R_30()
  {
-    if (!jj_rescan) trace_call("Command(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_24()) {
-    jj_scanpos = xsp;
-    if (jj_3R_25()) {
-    jj_scanpos = xsp;
-    if (jj_3R_26()) {
+    if (jj_3R_37()) {
     jj_scanpos = xsp;
-    if (jj_3R_27()) {
-    jj_scanpos = xsp;
-    if (jj_3R_28()) {
-    jj_scanpos = xsp;
-    if (jj_3R_29()) { if (!jj_rescan) trace_return("Command(LOOKAHEAD FAILED)"); return true; }
-    }
-    }
-    }
-    }
+    if (jj_3R_38()) return true;
     }
-    { if (!jj_rescan) trace_return("Command(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_24()
- {
-    if (jj_3R_35()) return true;
     return false;
   }
 
@@ -3663,151 +3215,102 @@ private boolean jj_3R_32()
     return false;
   }
 
-  private boolean jj_3_5()
+  private boolean jj_3_3()
  {
-    if (jj_3R_14()) return true;
+    if (jj_3R_17()) return true;
     return false;
   }
 
-  private boolean jj_3R_20()
+  private boolean jj_3R_23()
  {
-    if (!jj_rescan) trace_call("Key(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_5()) {
+    if (jj_3_3()) {
     jj_scanpos = xsp;
     if (jj_3R_32()) {
     jj_scanpos = xsp;
-    if (jj_3R_33()) { if (!jj_rescan) trace_return("Key(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_33()) return true;
     }
     }
-    { if (!jj_rescan) trace_return("Key(LOOKAHEAD SUCCEEDED)"); return false; }
+    return false;
   }
 
   private boolean jj_3R_31()
  {
-    if (!jj_rescan) trace_call("Timestamp(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(37)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(23)) { if (!jj_rescan) trace_return("Timestamp(LOOKAHEAD FAILED)"); return true; }
-    }
-    if (jj_3_11()) { if (!jj_rescan) trace_return("Timestamp(LOOKAHEAD FAILED)"); return true; }
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_11()) { jj_scanpos = xsp; break; }
+    if (jj_scan_token(23)) return true;
     }
-    { if (!jj_rescan) trace_return("Timestamp(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_79()
- {
-    if (!jj_rescan) trace_call("VerifyCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(VERIFY)) { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_85()) { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("VerifyCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_72()
- {
-    if (!jj_rescan) trace_call("LinkCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(LINK)) { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(FROM)) { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("LinkCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_105()
- {
-    if (!jj_rescan) trace_call("BinaryOperator(LOOKING AHEAD...)");
-    if (jj_scan_token(BINARY_OPERATOR)) { if (!jj_rescan) trace_return("BinaryOperator(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("BinaryOperator(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_97()
- {
-    if (jj_3R_105()) return true;
-    if (jj_3R_106()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_96()
- {
-    if (jj_3R_104()) return true;
-    if (jj_3R_85()) return true;
     return false;
   }
 
-  private boolean jj_3R_93()
+  private boolean jj_3R_57()
  {
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_scan_token(BINARY_OPERATOR)) return true;
     return false;
   }
 
-  private boolean jj_3R_95()
+  private boolean jj_3R_47()
  {
-    if (jj_3R_102()) return true;
-    if (jj_3R_103()) return true;
+    if (jj_3R_57()) return true;
+    if (jj_3R_58()) return true;
+    if (jj_3R_58()) return true;
     return false;
   }
 
-  private boolean jj_3R_19()
+  private boolean jj_3R_46()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_54()) return true;
+    if (jj_3R_55()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_56()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_50()
+  private boolean jj_3R_45()
  {
-    if (jj_3R_73()) return true;
+    if (jj_3R_51()) return true;
+    if (jj_3R_52()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_53()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_94()
+  private boolean jj_3R_22()
  {
-    if (jj_3R_100()) return true;
-    if (jj_3R_101()) return true;
+    if (jj_scan_token(OPEN_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_37()
+  private boolean jj_3R_44()
  {
-    if (!jj_rescan) trace_call("LinkOperations(LOOKING AHEAD...)");
+    if (jj_3R_48()) return true;
+    if (jj_3R_49()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_49()) {
-    jj_scanpos = xsp;
-    if (jj_3R_50()) { if (!jj_rescan) trace_return("LinkOperations(LOOKAHEAD FAILED)"); return true; }
-    }
-    { if (!jj_rescan) trace_return("LinkOperations(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_49()
- {
-    if (jj_3R_72()) return true;
+    if (jj_3R_50()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_104()
+  private boolean jj_3R_54()
  {
-    if (!jj_rescan) trace_call("UnaryOperator(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(42)) {
     jj_scanpos = xsp;
     if (jj_scan_token(44)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(45)) { if (!jj_rescan) trace_return("UnaryOperator(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(45)) return true;
     }
     }
-    { if (!jj_rescan) trace_return("UnaryOperator(LOOKAHEAD SUCCEEDED)"); return false; }
+    return false;
   }
 
-  private boolean jj_3R_18()
+  private boolean jj_3R_21()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -3818,66 +3321,63 @@ private boolean jj_3R_18()
     return false;
   }
 
-  private boolean jj_3_25()
+  private boolean jj_3R_16()
  {
-    if (jj_3R_20()) return true;
+    if (jj_3R_30()) return true;
+    return false;
+  }
+
+  private boolean jj_3_23()
+ {
+    if (jj_3R_23()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_23()
+  private boolean jj_3R_36()
  {
-    if (jj_3R_31()) return true;
+    if (jj_scan_token(CONJUNCTION)) return true;
     return false;
   }
 
-  private boolean jj_3R_84()
+  private boolean jj_3R_28()
  {
-    if (!jj_rescan) trace_call("RelationalExpression(LOOKING AHEAD...)");
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("RelationalExpression(LOOKAHEAD FAILED)"); return true; }
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_94()) {
-    jj_scanpos = xsp;
-    if (jj_3R_95()) {
-    jj_scanpos = xsp;
-    if (jj_3R_96()) {
-    jj_scanpos = xsp;
-    if (jj_3R_97()) { if (!jj_rescan) trace_return("RelationalExpression(LOOKAHEAD FAILED)"); return true; }
-    }
-    }
-    }
-    { if (!jj_rescan) trace_return("RelationalExpression(LOOKAHEAD SUCCEEDED)"); return false; }
+    if (jj_scan_token(DISJUNCTION)) return true;
+    return false;
   }
 
-  private boolean jj_3R_89()
+  private boolean jj_3R_26()
  {
-    if (jj_3R_21()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_78()
+  private boolean jj_3R_43()
  {
-    if (!jj_rescan) trace_call("AuditCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(AUDIT)) { if (!jj_rescan) trace_return("AuditCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_23()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_25()) {
+    if (jj_3R_44()) {
+    jj_scanpos = xsp;
+    if (jj_3R_45()) {
     jj_scanpos = xsp;
-    if (jj_3R_93()) { if (!jj_rescan) trace_return("AuditCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_46()) {
+    jj_scanpos = xsp;
+    if (jj_3R_47()) return true;
+    }
+    }
     }
-    { if (!jj_rescan) trace_return("AuditCommand(LOOKAHEAD SUCCEEDED)"); return false; }
+    return false;
   }
 
-  private boolean jj_3R_17()
+  private boolean jj_3R_20()
  {
     if (jj_scan_token(COMMA)) return true;
     if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3_14()
+  private boolean jj_3_12()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -3893,16 +3393,15 @@ private boolean jj_3_14()
     }
     if (jj_scan_token(COMMA)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_18()) {
+    if (jj_3R_21()) {
     jj_scanpos = xsp;
-    if (jj_3R_19()) return true;
+    if (jj_3R_22()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_102()
+  private boolean jj_3R_51()
  {
-    if (!jj_rescan) trace_call("RegexBasedOperator(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(53)) {
@@ -3911,74 +3410,56 @@ private boolean jj_3R_102()
     jj_scanpos = xsp;
     if (jj_scan_token(55)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(56)) { if (!jj_rescan) trace_return("RegexBasedOperator(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(56)) return true;
     }
     }
     }
-    { if (!jj_rescan) trace_return("RegexBasedOperator(LOOKAHEAD SUCCEEDED)"); return false; }
+    return false;
   }
 
-  private boolean jj_3R_16()
+  private boolean jj_3R_19()
  {
     if (jj_scan_token(CLOSE_PARENTHESES)) return true;
     return false;
   }
 
-  private boolean jj_3R_88()
+  private boolean jj_3R_15()
  {
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_3R_29()) return true;
     return false;
   }
 
-  private boolean jj_3R_100()
- {
-    if (!jj_rescan) trace_call("LinksToOperator(LOOKING AHEAD...)");
-    if (jj_scan_token(LINKS_TO)) { if (!jj_rescan) trace_return("LinksToOperator(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("LinksToOperator(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_92()
+  private boolean jj_3R_48()
  {
-    if (jj_3R_21()) return true;
+    if (jj_scan_token(LINKS_TO)) return true;
     return false;
   }
 
-  private boolean jj_3R_71()
+  private boolean jj_3R_35()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(23)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(24)) return true;
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_88()) {
+    if (jj_3R_39()) {
     jj_scanpos = xsp;
-    if (jj_3R_89()) return true;
+    if (jj_3R_40()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_62()
+  private boolean jj_3R_39()
  {
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    if (jj_3R_13()) return true;
+    if (jj_3R_12()) return true;
     return false;
   }
 
-  private boolean jj_3R_41()
+  private boolean jj_3R_14()
  {
-    if (!jj_rescan) trace_call("UnaryExpression(LOOKING AHEAD...)");
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_62()) {
-    jj_scanpos = xsp;
-    if (jj_3R_63()) { if (!jj_rescan) trace_return("UnaryExpression(LOOKAHEAD FAILED)"); return true; }
-    }
-    { if (!jj_rescan) trace_return("UnaryExpression(LOOKAHEAD SUCCEEDED)"); return false; }
+    if (jj_3R_30()) return true;
+    return false;
   }
 
-  private boolean jj_3_13()
+  private boolean jj_3_11()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -3993,84 +3474,65 @@ private boolean jj_3_13()
     }
     }
     xsp = jj_scanpos;
-    if (jj_3R_16()) {
+    if (jj_3R_19()) {
     jj_scanpos = xsp;
-    if (jj_3R_17()) return true;
+    if (jj_3R_20()) return true;
     }
     return false;
   }
 
-  private boolean jj_3_24()
+  private boolean jj_3_22()
  {
     if (jj_scan_token(NUMERIC)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_23()) jj_scanpos = xsp;
+    if (jj_3R_26()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_15()
- {
-    if (!jj_rescan) trace_call("ValueFunction(LOOKING AHEAD...)");
-    if (jj_scan_token(ALPHANUMERIC)) { if (!jj_rescan) trace_return("ValueFunction(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(OPEN_PARENTHESES)) { if (!jj_rescan) trace_return("ValueFunction(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("ValueFunction(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_48()
+  private boolean jj_3R_18()
  {
-    if (!jj_rescan) trace_call("InsertCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(INSERT)) { if (!jj_rescan) trace_return("InsertCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_70()) { if (!jj_rescan) trace_return("InsertCommand(LOOKAHEAD FAILED)"); return true; }
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_71()) jj_scanpos = xsp;
-    { if (!jj_rescan) trace_return("InsertCommand(LOOKAHEAD SUCCEEDED)"); return false; }
+    if (jj_scan_token(ALPHANUMERIC)) return true;
+    if (jj_scan_token(OPEN_PARENTHESES)) return true;
+    return false;
   }
 
-  private boolean jj_3R_112()
+  private boolean jj_3R_65()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_30()
- {
-    if (!jj_rescan) trace_call("ConjunctionExpression(LOOKING AHEAD...)");
-    if (jj_3R_41()) { if (!jj_rescan) trace_return("ConjunctionExpression(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("ConjunctionExpression(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_77()
+  private boolean jj_3R_27()
  {
-    if (!jj_rescan) trace_call("DescribeCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(DESCRIBE)) { if (!jj_rescan) trace_return("DescribeCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_35()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_24()) {
-    jj_scanpos = xsp;
-    if (jj_3R_92()) { if (!jj_rescan) trace_return("DescribeCommand(LOOKAHEAD FAILED)"); return true; }
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_36()) { jj_scanpos = xsp; break; }
     }
-    { if (!jj_rescan) trace_return("DescribeCommand(LOOKAHEAD SUCCEEDED)"); return false; }
+    return false;
   }
 
   private boolean jj_3R_13()
  {
-    if (!jj_rescan) trace_call("DisjunctionExpression(LOOKING AHEAD...)");
-    if (jj_3R_30()) { if (!jj_rescan) trace_return("DisjunctionExpression(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("DisjunctionExpression(LOOKAHEAD SUCCEEDED)"); return false; }
+    if (jj_3R_29()) return true;
+    return false;
   }
 
-  private boolean jj_3R_36()
+  private boolean jj_3R_12()
  {
-    if (!jj_rescan) trace_call("RecordOperations(LOOKING AHEAD...)");
-    if (jj_3R_48()) { if (!jj_rescan) trace_return("RecordOperations(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("RecordOperations(LOOKAHEAD SUCCEEDED)"); return false; }
+    if (jj_3R_27()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_28()) { jj_scanpos = xsp; break; }
+    }
+    return false;
   }
 
-  private boolean jj_3R_14()
+  private boolean jj_3R_17()
  {
-    if (!jj_rescan) trace_call("KeyFunction(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(69)) {
@@ -4081,62 +3543,51 @@ private boolean jj_3R_14()
     jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) { if (!jj_rescan) trace_return("KeyFunction(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(72)) return true;
     }
     }
     }
     }
-    if (jj_scan_token(PIPE)) { if (!jj_rescan) trace_return("KeyFunction(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(ALPHANUMERIC)) { if (!jj_rescan) trace_return("KeyFunction(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("KeyFunction(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_91()
- {
-    if (jj_3R_22()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_69()
- {
-    if (!jj_rescan) trace_call("VerifyOrSetCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(VERIFY_OR_SET)) { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_85()) { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("VerifyOrSetCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3_23()
- {
-    if (jj_3R_22()) return true;
+    if (jj_scan_token(PIPE)) return true;
+    if (jj_scan_token(ALPHANUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_12()
+  private boolean jj_3_21()
  {
-    if (jj_3R_14()) return true;
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3_4()
+  private boolean jj_3_2()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(38)) jj_scanpos = xsp;
-    if (jj_3R_13()) return true;
+    if (jj_3R_12()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_15()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_16()) jj_scanpos = xsp;
+    if (jj_scan_token(0)) return true;
     return false;
   }
 
-  private boolean jj_3_22()
+  private boolean jj_3_10()
  {
-    if (jj_3R_20()) return true;
+    if (jj_3R_17()) return true;
+    return false;
+  }
+
+  private boolean jj_3_20()
+ {
+    if (jj_3R_23()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_24()) return true;
     return false;
   }
 
-  private boolean jj_3R_111()
+  private boolean jj_3R_64()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -4159,56 +3610,31 @@ private boolean jj_3R_111()
     return false;
   }
 
-  private boolean jj_3R_70()
- {
-    if (!jj_rescan) trace_call("JsonObject(LOOKING AHEAD...)");
-    if (jj_scan_token(QUOTED_STRING)) { if (!jj_rescan) trace_return("JsonObject(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("JsonObject(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3_3()
- {
-    if (jj_3R_12()) return true;
-    if (jj_scan_token(0)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_68()
- {
-    if (!jj_rescan) trace_call("VerifyAndSwapCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(VERIFY_AND_SWAP)) { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_85()) { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("VerifyAndSwapCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3_21()
+  private boolean jj_3_19()
  {
-    if (jj_3R_20()) return true;
+    if (jj_3R_23()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_106()
+  private boolean jj_3R_58()
  {
-    if (!jj_rescan) trace_call("BinaryValue(LOOKING AHEAD...)");
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_10()) {
+    if (jj_3_8()) {
     jj_scanpos = xsp;
-    if (jj_3R_111()) {
+    if (jj_3R_64()) {
     jj_scanpos = xsp;
-    if (jj_3R_112()) { if (!jj_rescan) trace_return("BinaryValue(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_65()) return true;
     }
     }
-    { if (!jj_rescan) trace_return("BinaryValue(LOOKAHEAD SUCCEEDED)"); return false; }
+    return false;
   }
 
-  private boolean jj_3_10()
+  private boolean jj_3_8()
  {
-    if (jj_3R_15()) return true;
+    if (jj_3R_18()) return true;
     return false;
   }
 
@@ -4218,86 +3644,46 @@ private boolean jj_3R_34()
     return false;
   }
 
-  private boolean jj_3R_76()
- {
-    if (!jj_rescan) trace_call("GetCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(GET)) { if (!jj_rescan) trace_return("GetCommand(LOOKAHEAD FAILED)"); return true; }
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_21()) {
-    jj_scanpos = xsp;
-    if (jj_3_22()) {
-    jj_scanpos = xsp;
-    if (jj_3_23()) {
-    jj_scanpos = xsp;
-    if (jj_3R_91()) { if (!jj_rescan) trace_return("GetCommand(LOOKAHEAD FAILED)"); return true; }
-    }
-    }
-    }
-    { if (!jj_rescan) trace_return("GetCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_22()
+  private boolean jj_3R_25()
  {
-    if (!jj_rescan) trace_call("KeyCollection(LOOKING AHEAD...)");
-    if (jj_scan_token(OPEN_BRACKET)) { if (!jj_rescan) trace_return("KeyCollection(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("KeyCollection(LOOKAHEAD FAILED)"); return true; }
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_23()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
       if (jj_3R_34()) { jj_scanpos = xsp; break; }
     }
-    if (jj_scan_token(CLOSE_BRACKET)) { if (!jj_rescan) trace_return("KeyCollection(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("KeyCollection(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_87()
- {
-    if (jj_3R_22()) return true;
+    if (jj_scan_token(CLOSE_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3_2()
+  private boolean jj_3_1()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(38)) jj_scanpos = xsp;
-    if (jj_3R_13()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_110()
- {
-    if (jj_scan_token(QUOTED_STRING)) return true;
-    return false;
-  }
-
-  private boolean jj_3_1()
- {
     if (jj_3R_12()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_13()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_14()) jj_scanpos = xsp;
     if (jj_scan_token(78)) return true;
     return false;
   }
 
-  private boolean jj_3R_107()
- {
-    if (jj_scan_token(COMMA)) return true;
-    return false;
-  }
-
-  private boolean jj_3_17()
+  private boolean jj_3R_61()
  {
-    if (jj_3R_22()) return true;
+    if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_90()
+  private boolean jj_3_15()
  {
-    if (jj_3R_22()) return true;
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3_8()
+  private boolean jj_3_6()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -4326,35 +3712,27 @@ private boolean jj_3_8()
     return false;
   }
 
-  private boolean jj_3R_21()
+  private boolean jj_3R_24()
  {
-    if (!jj_rescan) trace_call("RecordCollection(LOOKING AHEAD...)");
-    if (jj_scan_token(OPEN_BRACKET)) { if (!jj_rescan) trace_return("RecordCollection(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("RecordCollection(LOOKAHEAD FAILED)"); return true; }
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_107()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(CLOSE_BRACKET)) { if (!jj_rescan) trace_return("RecordCollection(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("RecordCollection(LOOKAHEAD SUCCEEDED)"); return false; }
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    return false;
   }
 
-  private boolean jj_3_16()
+  private boolean jj_3_14()
  {
-    if (jj_3R_20()) return true;
+    if (jj_3R_23()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_24()) return true;
     return false;
   }
 
-  private boolean jj_3_20()
+  private boolean jj_3_18()
  {
-    if (jj_3R_22()) return true;
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3_9()
+  private boolean jj_3_7()
  {
     Token xsp;
     xsp = jj_scanpos;
@@ -4383,306 +3761,134 @@ private boolean jj_3_9()
     return false;
   }
 
-  private boolean jj_3R_109()
+  private boolean jj_3R_60()
  {
     Token xsp;
-    if (jj_3_9()) return true;
+    if (jj_3_7()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_9()) { jj_scanpos = xsp; break; }
+      if (jj_3_7()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_86()
- {
-    if (jj_scan_token(AS)) return true;
-    if (jj_3R_85()) return true;
-    return false;
-  }
-
-  private boolean jj_3_15()
+  private boolean jj_3_13()
  {
-    if (jj_3R_20()) return true;
+    if (jj_3R_23()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_19()
+  private boolean jj_3_17()
  {
-    if (jj_3R_20()) return true;
+    if (jj_3R_23()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_21()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_61()
- {
-    if (jj_3R_22()) return true;
+    if (jj_3R_24()) return true;
     return false;
   }
 
-  private boolean jj_3R_67()
- {
-    if (!jj_rescan) trace_call("ClearCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(CLEAR)) { if (!jj_rescan) trace_return("ClearCommand(LOOKAHEAD FAILED)"); return true; }
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_15()) {
-    jj_scanpos = xsp;
-    if (jj_3_16()) {
-    jj_scanpos = xsp;
-    if (jj_3_17()) {
-    jj_scanpos = xsp;
-    if (jj_3R_87()) { if (!jj_rescan) trace_return("ClearCommand(LOOKAHEAD FAILED)"); return true; }
-    }
-    }
-    }
-    { if (!jj_rescan) trace_return("ClearCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3_18()
+  private boolean jj_3_16()
  {
-    if (jj_3R_20()) return true;
+    if (jj_3R_23()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_28()
+  private boolean jj_3_26()
  {
-    if (jj_3R_22()) return true;
+    if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3R_108()
+  private boolean jj_3R_59()
  {
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_103()
- {
-    if (!jj_rescan) trace_call("RegexValue(LOOKING AHEAD...)");
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_108()) {
-    jj_scanpos = xsp;
-    if (jj_3R_109()) {
-    jj_scanpos = xsp;
-    if (jj_3R_110()) { if (!jj_rescan) trace_return("RegexValue(LOOKAHEAD FAILED)"); return true; }
-    }
+    if (jj_3_6()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_6()) { jj_scanpos = xsp; break; }
     }
-    { if (!jj_rescan) trace_return("RegexValue(LOOKAHEAD SUCCEEDED)"); return false; }
+    return false;
   }
 
-  private boolean jj_3R_75()
+  private boolean jj_3R_52()
  {
-    if (!jj_rescan) trace_call("FetchCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(FETCH)) { if (!jj_rescan) trace_return("FetchCommand(LOOKAHEAD FAILED)"); return true; }
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_18()) {
-    jj_scanpos = xsp;
-    if (jj_3_19()) {
+    if (jj_3R_59()) {
     jj_scanpos = xsp;
-    if (jj_3_20()) {
+    if (jj_3R_60()) {
     jj_scanpos = xsp;
-    if (jj_3R_90()) { if (!jj_rescan) trace_return("FetchCommand(LOOKAHEAD FAILED)"); return true; }
+    if (jj_3R_61()) return true;
     }
     }
-    }
-    { if (!jj_rescan) trace_return("FetchCommand(LOOKAHEAD SUCCEEDED)"); return false; }
+    return false;
   }
 
-  private boolean jj_3_27()
+  private boolean jj_3_25()
  {
-    if (jj_3R_20()) return true;
+    if (jj_3R_23()) return true;
     if (jj_scan_token(IN)) return true;
-    if (jj_3R_21()) return true;
+    if (jj_3R_24()) return true;
     return false;
   }
 
-  private boolean jj_3R_66()
- {
-    if (!jj_rescan) trace_call("RemoveCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(REMOVE)) { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD FAILED)"); return true; }
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_86()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(25)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(23)) { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD FAILED)"); return true; }
-    }
-    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("RemoveCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3_26()
+  private boolean jj_3_24()
  {
-    if (jj_3R_20()) return true;
+    if (jj_3R_23()) return true;
     if (jj_scan_token(IN)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_101()
- {
-    if (!jj_rescan) trace_call("LinksToValue(LOOKING AHEAD...)");
-    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("LinksToValue(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("LinksToValue(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_74()
- {
-    if (!jj_rescan) trace_call("SelectCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(SELECT)) { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(FROM)) { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(NUMERIC)) { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("SelectCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_40()
- {
-    if (!jj_rescan) trace_call("RevertCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(REVERT)) { if (!jj_rescan) trace_return("RevertCommand(LOOKAHEAD FAILED)"); return true; }
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_26()) {
-    jj_scanpos = xsp;
-    if (jj_3_27()) {
-    jj_scanpos = xsp;
-    if (jj_3_28()) {
-    jj_scanpos = xsp;
-    if (jj_3R_61()) { if (!jj_rescan) trace_return("RevertCommand(LOOKAHEAD FAILED)"); return true; }
-    }
-    }
-    }
-    { if (!jj_rescan) trace_return("RevertCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_65()
- {
-    if (!jj_rescan) trace_call("SetCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(SET)) { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_85()) { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("SetCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_99()
- {
-    if (jj_scan_token(QUOTED_STRING)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_57()
- {
-    if (jj_3R_80()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_56()
+  private boolean jj_3R_49()
  {
-    if (jj_3R_79()) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_55()
+  private boolean jj_3R_63()
  {
-    if (jj_3R_78()) return true;
+    if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_83()
- {
-    if (!jj_rescan) trace_call("AbortCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(ABORT)) { if (!jj_rescan) trace_return("AbortCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("AbortCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_54()
+  private boolean jj_3R_29()
  {
-    if (jj_3R_77()) return true;
+    if (jj_scan_token(ORDER)) return true;
     return false;
   }
 
-  private boolean jj_3R_64()
- {
-    if (!jj_rescan) trace_call("AddCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(ADD)) { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_20()) { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_scan_token(AS)) { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD FAILED)"); return true; }
-    if (jj_3R_85()) { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("AddCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
   private boolean jj_3R_53()
  {
-    if (jj_3R_76()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_52()
+  private boolean jj_3R_56()
  {
-    if (jj_3R_75()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_38()
- {
-    if (!jj_rescan) trace_call("QueryOperations(LOOKING AHEAD...)");
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_51()) {
-    jj_scanpos = xsp;
-    if (jj_3R_52()) {
-    jj_scanpos = xsp;
-    if (jj_3R_53()) {
-    jj_scanpos = xsp;
-    if (jj_3R_54()) {
-    jj_scanpos = xsp;
-    if (jj_3R_55()) {
-    jj_scanpos = xsp;
-    if (jj_3R_56()) {
-    jj_scanpos = xsp;
-    if (jj_3R_57()) { if (!jj_rescan) trace_return("QueryOperations(LOOKAHEAD FAILED)"); return true; }
-    }
-    }
-    }
-    }
-    }
-    }
-    { if (!jj_rescan) trace_return("QueryOperations(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_51()
+  private boolean jj_3R_40()
  {
-    if (jj_3R_74()) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
-  private boolean jj_3R_82()
- {
-    if (!jj_rescan) trace_call("CommitCommand(LOOKING AHEAD...)");
-    if (jj_scan_token(COMMIT)) { if (!jj_rescan) trace_return("CommitCommand(LOOKAHEAD FAILED)"); return true; }
-    { if (!jj_rescan) trace_return("CommitCommand(LOOKAHEAD SUCCEEDED)"); return false; }
-  }
-
-  private boolean jj_3R_63()
+  private boolean jj_3R_50()
  {
-    if (jj_3R_84()) return true;
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_47()
+  private boolean jj_3R_42()
  {
-    if (jj_3R_69()) return true;
+    if (jj_scan_token(SIZE)) return true;
     return false;
   }
 
@@ -4697,7 +3903,7 @@ private boolean jj_3R_47()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[85];
+  final private int[] jj_la1 = new int[87];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -4707,21 +3913,18 @@ private boolean jj_3R_47()
 	   jj_la1_init_2();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x8000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x800000,0x800000,0x0,0x0,0x800000,0x380000,0x0,0x0,0x0,};
+	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x7ffff8,0x0,0x0,0x0,0x0,0x7ffff8,0x0,0x0,0x0,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x8000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x800000,0x800000,0x0,0x0,0x800000,0x380000,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x40,0x10000000,0xc000000,0x1c000000,0x40,0x10000000,0xc000000,0x1c000000,0x200,0x100,0x82,0x20,0x20,0x20,0x20,0x1f03c00,0x80,0x80,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x1e00000,0x3400,0x20,0x0,0x8000000,0x4000000,0xc000000,0x0,0x60000000,0x3080,0x20,0x3000,0x60000000,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x20,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x8,0x0,0x20,0x0,0x8,0x0,0x0,};
+	   jj_la1_1 = new int[] {0x40,0x10000000,0xc000000,0x0,0x1c000000,0x40,0x10000000,0xc000000,0x0,0x1c000000,0x200,0x100,0x82,0x20,0x20,0x20,0x20,0x1f03c00,0x80,0x80,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x1e00000,0x3400,0x20,0x0,0x8000000,0x4000000,0xc000000,0x0,0x60000000,0x3080,0x20,0x3000,0x60000000,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x20,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x8,0x0,0x20,0x0,0x8,0x0,0x0,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x1e8,0x0,0x0,0x0,0x1e8,0x0,0x0,0x1e8,0x0,0x0,0x0,0x0,0x0,0xe8,0x1e8,0x3e8,0x3e9,0x183e8,0x183e8,0x183e9,0x3e8,0x3e9,0x0,0x0,0x0,0x2e9,0x0,0x0,0x0,0x10,0x0,0x1e8,0x0,0x0,0x0,0x80,0x1e8,0x1e0,0x10,0x1e0,0x28,0x10,0x28,0x28,0x10,0x28,0x28,0x1e0,0x10,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x10,0x10,};
+	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x1e8,0x0,0x0,0x0,0x0,0x1e8,0x0,0x0,0x1e8,0x0,0x0,0x0,0x0,0x0,0xe8,0x1e8,0x3e8,0x3e9,0x183e8,0x183e8,0x183e9,0x3e8,0x3e9,0x0,0x0,0x0,0x2e9,0x0,0x0,0x0,0x10,0x0,0x1e8,0x0,0x0,0x0,0x80,0x1e8,0x1e0,0x10,0x1e0,0x28,0x10,0x28,0x28,0x10,0x28,0x28,0x1e0,0x10,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x10,0x10,};
 	}
-  final private JJCalls[] jj_2_rtns = new JJCalls[28];
+  final private JJCalls[] jj_2_rtns = new JJCalls[26];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
-  {
-      enable_tracing();
-  }
   /** Constructor with InputStream. */
   public Grammar(java.io.InputStream stream) {
 	  this(stream, null);
@@ -4733,7 +3936,7 @@ public Grammar(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4749,7 +3952,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4760,7 +3963,7 @@ public Grammar(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4780,7 +3983,7 @@ public void ReInit(java.io.Reader stream) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4790,7 +3993,7 @@ public Grammar(GrammarTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4801,7 +4004,7 @@ public void ReInit(GrammarTokenManager tm) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 85; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4822,7 +4025,6 @@ private Token jj_consume_token(int kind) throws ParseException {
 		   }
 		 }
 	   }
-	   trace_token(token, "");
 	   return token;
 	 }
 	 token = oldToken;
@@ -4848,8 +4050,6 @@ private boolean jj_scan_token(int kind) {
 	   int i = 0; Token tok = token;
 	   while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
 	   if (tok != null) jj_add_error_token(kind, i);
-	 } else {
-	   trace_scan(jj_scanpos, kind);
 	 }
 	 if (jj_scanpos.kind != kind) return true;
 	 if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
@@ -4863,7 +4063,6 @@ final public Token getNextToken() {
 	 else token = token.next = token_source.getNextToken();
 	 jj_ntk = -1;
 	 jj_gen++;
-	   trace_token(token, " (in getNextToken)");
 	 return token;
   }
 
@@ -4936,7 +4135,7 @@ public ParseException generateParseException() {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 85; i++) {
+	 for (int i = 0; i < 87; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4976,57 +4175,17 @@ final public boolean trace_enabled() {
 	 return trace_enabled;
   }
 
-/** Enable tracing. */
+  /** Enable tracing. */
   final public void enable_tracing() {
-	 trace_enabled = true;
   }
 
-/** Disable tracing. */
+  /** Disable tracing. */
   final public void disable_tracing() {
-	 trace_enabled = false;
-  }
-
-  protected void trace_call(String s) {
-	 if (trace_enabled) {
-	   for (int i = 0; i < trace_indent; i++) { System.out.print(" "); }
-	   System.out.println("Call:	" + s);
-	 }
-	 trace_indent = trace_indent + 2;
-  }
-
-  protected void trace_return(String s) {
-	 trace_indent = trace_indent - 2;
-	 if (trace_enabled) {
-	   for (int i = 0; i < trace_indent; i++) { System.out.print(" "); }
-	   System.out.println("Return: " + s);
-	 }
-  }
-
-  protected void trace_token(Token t, String where) {
-	 if (trace_enabled) {
-	   for (int i = 0; i < trace_indent; i++) { System.out.print(" "); }
-	   System.out.print("Consumed token: <" + tokenImage[t.kind]);
-	   if (t.kind != 0 && !tokenImage[t.kind].equals("\"" + t.image + "\"")) {
-		 System.out.print(": \"" + TokenMgrError.addEscapes(t.image) + "\"");
-	   }
-	   System.out.println(" at line " + t.beginLine + " column " + t.beginColumn + ">" + where);
-	 }
-  }
-
-  protected void trace_scan(Token t1, int t2) {
-	 if (trace_enabled) {
-	   for (int i = 0; i < trace_indent; i++) { System.out.print(" "); }
-	   System.out.print("Visited token: <" + tokenImage[t1.kind]);
-	   if (t1.kind != 0 && !tokenImage[t1.kind].equals("\"" + t1.image + "\"")) {
-		 System.out.print(": \"" + TokenMgrError.addEscapes(t1.image) + "\"");
-	   }
-	   System.out.println(" at line " + t1.beginLine + " column " + t1.beginColumn + ">; Expected token: <" + tokenImage[t2] + ">");
-	 }
   }
 
   private void jj_rescan_token() {
 	 jj_rescan = true;
-	 for (int i = 0; i < 28; i++) {
+	 for (int i = 0; i < 26; i++) {
 	   try {
 		 JJCalls p = jj_2_rtns[i];
 
@@ -5060,8 +4219,6 @@ private void jj_rescan_token() {
 			   case 23: jj_3_24(); break;
 			   case 24: jj_3_25(); break;
 			   case 25: jj_3_26(); break;
-			   case 26: jj_3_27(); break;
-			   case 27: jj_3_28(); break;
 			 }
 		   }
 		   p = p.next;

From fc88a14f140715b0c0348210bb57e3857496d35c Mon Sep 17 00:00:00 2001
From: Javier Lores <lores.javier@gmail.com>
Date: Fri, 31 Jan 2025 14:56:29 -0500
Subject: [PATCH 7/9] fixed grammar for As of timetsamps

---
 grammar/grammar.jjt                           |   45 +-
 .../com/cinchapi/ccl/generated/Grammar.java   | 1011 +++++++-------
 .../ccl/generated/GrammarConstants.java       |  105 +-
 .../ccl/generated/GrammarTokenManager.java    | 1177 ++++++++---------
 .../java/com/cinchapi/ccl/GrammarTest.java    |   10 +
 5 files changed, 1244 insertions(+), 1104 deletions(-)

diff --git a/grammar/grammar.jjt b/grammar/grammar.jjt
index b20b06fc..409a2a3e 100644
--- a/grammar/grammar.jjt
+++ b/grammar/grammar.jjt
@@ -149,6 +149,7 @@ TOKEN [IGNORE_CASE]:
 | < INTO: "into" >
 | < FROM: "from" >
 | < TO: "to" >
+| < AS_OF: "as of" >
 | < AS: "as" >
 | < FOR: "for" >
 | < WITH: "with" >
@@ -162,7 +163,7 @@ TOKEN : { < OPEN_PARENTHESES : "(" > }
 TOKEN : { < CLOSE_PARENTHESES : ")" > }
 TOKEN : { < OPEN_BRACKET : "[" > }
 TOKEN : { < CLOSE_BRACKET : "]" > }
-TOKEN [IGNORE_CASE]: {< TIMESTAMP: "at" | "on" | "during" | "as of" > }
+TOKEN [IGNORE_CASE]: {< TIMESTAMP: "at" | "on" | "during" > }
 TOKEN [IGNORE_CASE]: { < WHERE: "where" > }
 TOKEN [IGNORE_CASE]: { < RESERVED_IDENTIFIER: "$id$" > }
 
@@ -537,6 +538,16 @@ TimestampSymbol Timestamp() :
   { return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp)); }
 }
 
+TimestampSymbol TimestampReadingCommand() :
+{
+  Token word;
+  String timestamp = "";
+}
+{
+  (<TIMESTAMP> | <IN> | <AS_OF>) (LOOKAHEAD(2) (word=<QUOTED_STRING> | word=<SIGNED_INTEGER> | word=<SIGNED_DECIMAL> | word=<NUMERIC> | word=<ALPHANUMERIC> | word=<NON_ALPHANUMERIC_AND_ALPHANUMERIC>) { timestamp += (timestamp.equals("")) ? word.image : " " + word.image; })+
+  { return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp)); }
+}
+
 void Page() #Page :
 {
   String number = null;
@@ -974,7 +985,7 @@ void SelectCommand() #Command :
     TimestampSymbol timestamp = null;
 }
 {
-    <SELECT> key=Key() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
+    <SELECT> key=Key() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
     {
         jjtThis.command(new SelectSymbol(key, Long.parseLong(record.image), timestamp));
     }
@@ -992,24 +1003,24 @@ void FetchCommand() #Command :
     <FETCH>
     (
         LOOKAHEAD(3)
-        key=Key() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
+        key=Key() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new FetchSymbol(key, Long.parseLong(record.image), timestamp));
         }
       |
         LOOKAHEAD(3)
-        key=Key() <FROM> records=RecordCollection() (timestamp=Timestamp())?
+        key=Key() <FROM> records=RecordCollection() (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new FetchSymbol(key, records, timestamp));
         }
       |
         LOOKAHEAD(3)
-        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
+        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
         }
       |
-        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=Timestamp())?
+        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new FetchSymbol(keys, records, timestamp));
         }
@@ -1028,24 +1039,24 @@ void GetCommand() #Command :
     <GET>
     (
         LOOKAHEAD(3)
-        key=Key() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
+        key=Key() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new GetSymbol(key, Long.parseLong(record.image), timestamp));
         }
       |
         LOOKAHEAD(3)
-        key=Key() <FROM> records=RecordCollection() (timestamp=Timestamp())?
+        key=Key() <FROM> records=RecordCollection() (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new GetSymbol(key, records, timestamp));
         }
       |
         LOOKAHEAD(3)
-        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=Timestamp())?
+        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
         }
       |
-        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=Timestamp())?
+        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new GetSymbol(keys, records, timestamp));
         }
@@ -1062,12 +1073,12 @@ void DescribeCommand() #Command :
     <DESCRIBE>
     (
         LOOKAHEAD(2)
-        record=<NUMERIC> (timestamp=Timestamp())?
+        record=<NUMERIC> (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
         }
       |
-        records=RecordCollection() (timestamp=Timestamp())?
+        records=RecordCollection() (timestamp=TimestampReadingCommand())?
         {
             jjtThis.command(new DescribeSymbol(records, timestamp));
         }
@@ -1104,7 +1115,7 @@ void VerifyCommand() #Command :
 }
 {
     <VERIFY> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
-    (timestamp=Timestamp())?
+    (timestamp=TimestampReadingCommand())?
     {
         jjtThis.command(new VerifySymbol(key, value, Long.parseLong(record.image), timestamp));
     }
@@ -1167,27 +1178,27 @@ void RevertCommand() #Command : {
     (
         LOOKAHEAD(3)
         key=Key() <IN> record=<NUMERIC>
-        timestamp=Timestamp()
+        timestamp=TimestampReadingCommand()
         {
             jjtThis.command(new RevertSymbol(key, Long.parseLong(record.image), timestamp));
         }
       |
         LOOKAHEAD(3)
         key=Key() <IN> records=RecordCollection()
-        timestamp=Timestamp()
+        timestamp=TimestampReadingCommand()
         {
             jjtThis.command(new RevertSymbol(key, records, timestamp));
         }
       |
         LOOKAHEAD(3)
         keys=KeyCollection() <IN> record=<NUMERIC>
-        timestamp=Timestamp()
+        timestamp=TimestampReadingCommand()
         {
             jjtThis.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
         }
       |
         keys=KeyCollection() <IN> records=RecordCollection()
-        timestamp=Timestamp()
+        timestamp=TimestampReadingCommand()
         {
             jjtThis.command(new RevertSymbol(keys, records, timestamp));
         }
diff --git a/src/main/java/com/cinchapi/ccl/generated/Grammar.java b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
index e9ed3067..18d1fe84 100644
--- a/src/main/java/com/cinchapi/ccl/generated/Grammar.java
+++ b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
@@ -105,7 +105,7 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
       case ABORT:
       case REVERT:{
         Command();
-        jj_consume_token(78);
+        jj_consume_token(79);
         break;
         }
       default:
@@ -140,18 +140,18 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
             jj_la1[2] = jj_gen;
             ;
           }
-          jj_consume_token(78);
+          jj_consume_token(79);
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case PAGE:
           case SIZE:{
             Page();
-            jj_consume_token(78);
+            jj_consume_token(79);
             break;
             }
           case ORDER:{
             Order();
-            jj_consume_token(78);
+            jj_consume_token(79);
             break;
             }
           case NUMERIC:
@@ -160,7 +160,7 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
           case ALPHANUMERIC:
           case PERIOD_SEPARATED_STRING:{
             Function();
-            jj_consume_token(78);
+            jj_consume_token(79);
             break;
             }
           default:
@@ -746,14 +746,14 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 79:{
-          word = jj_consume_token(79);
-          break;
-          }
         case 80:{
           word = jj_consume_token(80);
           break;
           }
+        case 81:{
+          word = jj_consume_token(81);
+          break;
+          }
         default:
           jj_la1[22] = jj_gen;
           jj_consume_token(-1);
@@ -784,8 +784,8 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
     case ALPHANUMERIC:
     case PERIOD_SEPARATED_STRING:
     case NON_ALPHANUMERIC_AND_ALPHANUMERIC:
-    case 79:
-    case 80:{
+    case 80:
+    case 81:{
       label_5:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -813,14 +813,14 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 79:{
-          word = jj_consume_token(79);
-          break;
-          }
         case 80:{
           word = jj_consume_token(80);
           break;
           }
+        case 81:{
+          word = jj_consume_token(81);
+          break;
+          }
         default:
           jj_la1[23] = jj_gen;
           jj_consume_token(-1);
@@ -1064,6 +1064,69 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
     throw new Error("Missing return statement in function");
 }
 
+  final public TimestampSymbol TimestampReadingCommand() throws ParseException {Token word;
+  String timestamp = "";
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case TIMESTAMP:{
+      jj_consume_token(TIMESTAMP);
+      break;
+      }
+    case IN:{
+      jj_consume_token(IN);
+      break;
+      }
+    case AS_OF:{
+      jj_consume_token(AS_OF);
+      break;
+      }
+    default:
+      jj_la1[31] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    label_7:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case QUOTED_STRING:{
+        word = jj_consume_token(QUOTED_STRING);
+        break;
+        }
+      case SIGNED_INTEGER:{
+        word = jj_consume_token(SIGNED_INTEGER);
+        break;
+        }
+      case SIGNED_DECIMAL:{
+        word = jj_consume_token(SIGNED_DECIMAL);
+        break;
+        }
+      case NUMERIC:{
+        word = jj_consume_token(NUMERIC);
+        break;
+        }
+      case ALPHANUMERIC:{
+        word = jj_consume_token(ALPHANUMERIC);
+        break;
+        }
+      case NON_ALPHANUMERIC_AND_ALPHANUMERIC:{
+        word = jj_consume_token(NON_ALPHANUMERIC_AND_ALPHANUMERIC);
+        break;
+        }
+      default:
+        jj_la1[32] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+timestamp += (timestamp.equals("")) ? word.image : " " + word.image;
+      if (jj_2_10(2)) {
+        ;
+      } else {
+        break label_7;
+      }
+    }
+{if ("" != null) return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp));}
+    throw new Error("Missing return statement in function");
+}
+
   final public void Page() throws ParseException {/*@bgen(jjtree) Page */
   ASTPage jjtn000 = new ASTPage(JJTPAGE);
   boolean jjtc000 = true;
@@ -1079,7 +1142,7 @@ final public void Page() throws ParseException {/*@bgen(jjtree) Page */
           break;
           }
         default:
-          jj_la1[31] = jj_gen;
+          jj_la1[33] = jj_gen;
           ;
         }
         break;
@@ -1092,13 +1155,13 @@ final public void Page() throws ParseException {/*@bgen(jjtree) Page */
           break;
           }
         default:
-          jj_la1[32] = jj_gen;
+          jj_la1[34] = jj_gen;
           ;
         }
         break;
         }
       default:
-        jj_la1[33] = jj_gen;
+        jj_la1[35] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1149,7 +1212,7 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
       jj_consume_token(ORDER);
       orderComponent = OrderClause();
 order.add(orderComponent);
-      label_7:
+      label_8:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case COMMA:{
@@ -1157,8 +1220,8 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
           break;
           }
         default:
-          jj_la1[34] = jj_gen;
-          break label_7;
+          jj_la1[36] = jj_gen;
+          break label_8;
         }
         jj_consume_token(COMMA);
         orderComponent = OrderClause();
@@ -1212,13 +1275,13 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
         break;
         }
       default:
-        jj_la1[35] = jj_gen;
+        jj_la1[37] = jj_gen;
         ;
       }
       break;
       }
     default:
-      jj_la1[36] = jj_gen;
+      jj_la1[38] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1229,7 +1292,7 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
       break;
       }
     default:
-      jj_la1[37] = jj_gen;
+      jj_la1[39] = jj_gen;
       ;
     }
 if(direction != null) {
@@ -1266,7 +1329,7 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
       break;
       }
     default:
-      jj_la1[38] = jj_gen;
+      jj_la1[40] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1286,7 +1349,7 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
       break;
       }
     default:
-      jj_la1[39] = jj_gen;
+      jj_la1[41] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1298,7 +1361,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);FunctionTokenSymbol function;
     try {
-      if (jj_2_10(2)) {
+      if (jj_2_11(2)) {
         function = KeyFunction();
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -1307,7 +1370,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[40] = jj_gen;
+          jj_la1[42] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1360,7 +1423,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
       break;
       }
     default:
-      jj_la1[41] = jj_gen;
+      jj_la1[43] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1378,7 +1441,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
   TimestampSymbol timestamp = null;
     function = jj_consume_token(ALPHANUMERIC);
     jj_consume_token(OPEN_PARENTHESES);
-    if (jj_2_11(3)) {
+    if (jj_2_12(3)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SIGNED_INTEGER:{
         key = jj_consume_token(SIGNED_INTEGER);
@@ -1397,7 +1460,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         break;
         }
       default:
-        jj_la1[42] = jj_gen;
+        jj_la1[44] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1415,11 +1478,11 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         break;
         }
       default:
-        jj_la1[43] = jj_gen;
+        jj_la1[45] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-    } else if (jj_2_12(3)) {
+    } else if (jj_2_13(3)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SIGNED_INTEGER:{
         key = jj_consume_token(SIGNED_INTEGER);
@@ -1438,7 +1501,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         break;
         }
       default:
-        jj_la1[44] = jj_gen;
+        jj_la1[46] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1456,12 +1519,12 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[45] = jj_gen;
+          jj_la1[47] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
 records.add(word.image);
-        label_8:
+        label_9:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case COMMA:{
@@ -1469,8 +1532,8 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[46] = jj_gen;
-            break label_8;
+            jj_la1[48] = jj_gen;
+            break label_9;
           }
           jj_consume_token(COMMA);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -1483,7 +1546,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[47] = jj_gen;
+            jj_la1[49] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -1505,12 +1568,12 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[48] = jj_gen;
+          jj_la1[50] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
 records.add(word.image);
-        label_9:
+        label_10:
         while (true) {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case COMMA:{
@@ -1518,8 +1581,8 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[49] = jj_gen;
-            break label_9;
+            jj_la1[51] = jj_gen;
+            break label_10;
           }
           jj_consume_token(COMMA);
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -1532,7 +1595,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[50] = jj_gen;
+            jj_la1[52] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -1546,7 +1609,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         break;
         }
       default:
-        jj_la1[51] = jj_gen;
+        jj_la1[53] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1574,7 +1637,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[52] = jj_gen;
+          jj_la1[54] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1596,14 +1659,14 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[53] = jj_gen;
+          jj_la1[55] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[54] = jj_gen;
+        jj_la1[56] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1652,7 +1715,7 @@ final public void Command() throws ParseException {
       break;
       }
     default:
-      jj_la1[55] = jj_gen;
+      jj_la1[57] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1685,7 +1748,7 @@ final public void DataModificationOperations() throws ParseException {
       break;
       }
     default:
-      jj_la1[56] = jj_gen;
+      jj_la1[58] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1781,7 +1844,7 @@ final public void RemoveCommand() throws ParseException {/*@bgen(jjtree) Command
         break;
         }
       default:
-        jj_la1[57] = jj_gen;
+        jj_la1[59] = jj_gen;
         ;
       }
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -1794,7 +1857,7 @@ final public void RemoveCommand() throws ParseException {/*@bgen(jjtree) Command
         break;
         }
       default:
-        jj_la1[58] = jj_gen;
+        jj_la1[60] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1832,21 +1895,21 @@ final public void ClearCommand() throws ParseException {/*@bgen(jjtree) Command
     Collection records = null;
     try {
       jj_consume_token(CLEAR);
-      if (jj_2_13(3)) {
+      if (jj_2_14(3)) {
         key = Key();
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(key, Long.parseLong(record.image)));
-      } else if (jj_2_14(3)) {
+      } else if (jj_2_15(3)) {
         key = Key();
         jj_consume_token(FROM);
         records = RecordCollection();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new ClearSymbol(key, records));
-      } else if (jj_2_15(3)) {
+      } else if (jj_2_16(3)) {
         keys = KeyCollection();
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
@@ -1865,7 +1928,7 @@ record = jj_consume_token(NUMERIC);
           break;
           }
         default:
-          jj_la1[59] = jj_gen;
+          jj_la1[61] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1994,7 +2057,7 @@ final public void InsertCommand() throws ParseException {/*@bgen(jjtree) Command
           break;
           }
         default:
-          jj_la1[60] = jj_gen;
+          jj_la1[62] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2010,14 +2073,14 @@ record = jj_consume_token(NUMERIC);
           break;
           }
         default:
-          jj_la1[61] = jj_gen;
+          jj_la1[63] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[62] = jj_gen;
+        jj_la1[64] = jj_gen;
         ;
       }
 jjtree.closeNodeScope(jjtn000, true);
@@ -2057,7 +2120,7 @@ final public void LinkOperations() throws ParseException {
       break;
       }
     default:
-      jj_la1[63] = jj_gen;
+      jj_la1[65] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2094,7 +2157,7 @@ final public void LinkCommand() throws ParseException {/*@bgen(jjtree) Command *
         break;
         }
       default:
-        jj_la1[64] = jj_gen;
+        jj_la1[66] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2150,7 +2213,7 @@ final public void UnlinkCommand() throws ParseException {/*@bgen(jjtree) Command
         break;
         }
       default:
-        jj_la1[65] = jj_gen;
+        jj_la1[67] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2206,7 +2269,7 @@ final public void QueryOperations() throws ParseException {
       break;
       }
     default:
-      jj_la1[66] = jj_gen;
+      jj_la1[68] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2225,12 +2288,13 @@ final public void SelectCommand() throws ParseException {/*@bgen(jjtree) Command
       record = jj_consume_token(NUMERIC);
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IN:
+      case AS_OF:
       case TIMESTAMP:{
-        timestamp = Timestamp();
+        timestamp = TimestampReadingCommand();
         break;
         }
       default:
-        jj_la1[67] = jj_gen;
+        jj_la1[69] = jj_gen;
         ;
       }
 jjtree.closeNodeScope(jjtn000, true);
@@ -2267,52 +2331,55 @@ final public void FetchCommand() throws ParseException {/*@bgen(jjtree) Command
     TimestampSymbol timestamp = null;
     try {
       jj_consume_token(FETCH);
-      if (jj_2_16(3)) {
+      if (jj_2_17(3)) {
         key = Key();
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IN:
+        case AS_OF:
         case TIMESTAMP:{
-          timestamp = Timestamp();
+          timestamp = TimestampReadingCommand();
           break;
           }
         default:
-          jj_la1[68] = jj_gen;
+          jj_la1[70] = jj_gen;
           ;
         }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new FetchSymbol(key, Long.parseLong(record.image), timestamp));
-      } else if (jj_2_17(3)) {
+      } else if (jj_2_18(3)) {
         key = Key();
         jj_consume_token(FROM);
         records = RecordCollection();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IN:
+        case AS_OF:
         case TIMESTAMP:{
-          timestamp = Timestamp();
+          timestamp = TimestampReadingCommand();
           break;
           }
         default:
-          jj_la1[69] = jj_gen;
+          jj_la1[71] = jj_gen;
           ;
         }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new FetchSymbol(key, records, timestamp));
-      } else if (jj_2_18(3)) {
+      } else if (jj_2_19(3)) {
         keys = KeyCollection();
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IN:
+        case AS_OF:
         case TIMESTAMP:{
-          timestamp = Timestamp();
+          timestamp = TimestampReadingCommand();
           break;
           }
         default:
-          jj_la1[70] = jj_gen;
+          jj_la1[72] = jj_gen;
           ;
         }
 jjtree.closeNodeScope(jjtn000, true);
@@ -2326,12 +2393,13 @@ record = jj_consume_token(NUMERIC);
           records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case IN:
+          case AS_OF:
           case TIMESTAMP:{
-            timestamp = Timestamp();
+            timestamp = TimestampReadingCommand();
             break;
             }
           default:
-            jj_la1[71] = jj_gen;
+            jj_la1[73] = jj_gen;
             ;
           }
 jjtree.closeNodeScope(jjtn000, true);
@@ -2340,7 +2408,7 @@ record = jj_consume_token(NUMERIC);
           break;
           }
         default:
-          jj_la1[72] = jj_gen;
+          jj_la1[74] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2376,52 +2444,55 @@ final public void GetCommand() throws ParseException {/*@bgen(jjtree) Command */
     TimestampSymbol timestamp = null;
     try {
       jj_consume_token(GET);
-      if (jj_2_19(3)) {
+      if (jj_2_20(3)) {
         key = Key();
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IN:
+        case AS_OF:
         case TIMESTAMP:{
-          timestamp = Timestamp();
+          timestamp = TimestampReadingCommand();
           break;
           }
         default:
-          jj_la1[73] = jj_gen;
+          jj_la1[75] = jj_gen;
           ;
         }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new GetSymbol(key, Long.parseLong(record.image), timestamp));
-      } else if (jj_2_20(3)) {
+      } else if (jj_2_21(3)) {
         key = Key();
         jj_consume_token(FROM);
         records = RecordCollection();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IN:
+        case AS_OF:
         case TIMESTAMP:{
-          timestamp = Timestamp();
+          timestamp = TimestampReadingCommand();
           break;
           }
         default:
-          jj_la1[74] = jj_gen;
+          jj_la1[76] = jj_gen;
           ;
         }
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new GetSymbol(key, records, timestamp));
-      } else if (jj_2_21(3)) {
+      } else if (jj_2_22(3)) {
         keys = KeyCollection();
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IN:
+        case AS_OF:
         case TIMESTAMP:{
-          timestamp = Timestamp();
+          timestamp = TimestampReadingCommand();
           break;
           }
         default:
-          jj_la1[75] = jj_gen;
+          jj_la1[77] = jj_gen;
           ;
         }
 jjtree.closeNodeScope(jjtn000, true);
@@ -2435,12 +2506,13 @@ record = jj_consume_token(NUMERIC);
           records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case IN:
+          case AS_OF:
           case TIMESTAMP:{
-            timestamp = Timestamp();
+            timestamp = TimestampReadingCommand();
             break;
             }
           default:
-            jj_la1[76] = jj_gen;
+            jj_la1[78] = jj_gen;
             ;
           }
 jjtree.closeNodeScope(jjtn000, true);
@@ -2449,7 +2521,7 @@ record = jj_consume_token(NUMERIC);
           break;
           }
         default:
-          jj_la1[77] = jj_gen;
+          jj_la1[79] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2483,16 +2555,17 @@ final public void DescribeCommand() throws ParseException {/*@bgen(jjtree) Comma
     TimestampSymbol timestamp = null;
     try {
       jj_consume_token(DESCRIBE);
-      if (jj_2_22(2)) {
+      if (jj_2_23(2)) {
         record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IN:
+        case AS_OF:
         case TIMESTAMP:{
-          timestamp = Timestamp();
+          timestamp = TimestampReadingCommand();
           break;
           }
         default:
-          jj_la1[78] = jj_gen;
+          jj_la1[80] = jj_gen;
           ;
         }
 jjtree.closeNodeScope(jjtn000, true);
@@ -2504,12 +2577,13 @@ record = jj_consume_token(NUMERIC);
           records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case IN:
+          case AS_OF:
           case TIMESTAMP:{
-            timestamp = Timestamp();
+            timestamp = TimestampReadingCommand();
             break;
             }
           default:
-            jj_la1[79] = jj_gen;
+            jj_la1[81] = jj_gen;
             ;
           }
 jjtree.closeNodeScope(jjtn000, true);
@@ -2518,7 +2592,7 @@ record = jj_consume_token(NUMERIC);
           break;
           }
         default:
-          jj_la1[80] = jj_gen;
+          jj_la1[82] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2551,7 +2625,7 @@ final public void AuditCommand() throws ParseException {/*@bgen(jjtree) Command
     Token record;
     try {
       jj_consume_token(AUDIT);
-      if (jj_2_23(2)) {
+      if (jj_2_24(2)) {
         key = Key();
         jj_consume_token(FROM);
         record = jj_consume_token(NUMERIC);
@@ -2568,7 +2642,7 @@ record = jj_consume_token(NUMERIC);
           break;
           }
         default:
-          jj_la1[81] = jj_gen;
+          jj_la1[83] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2610,12 +2684,13 @@ final public void VerifyCommand() throws ParseException {/*@bgen(jjtree) Command
       record = jj_consume_token(NUMERIC);
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IN:
+      case AS_OF:
       case TIMESTAMP:{
-        timestamp = Timestamp();
+        timestamp = TimestampReadingCommand();
         break;
         }
       default:
-        jj_la1[82] = jj_gen;
+        jj_la1[84] = jj_gen;
         ;
       }
 jjtree.closeNodeScope(jjtn000, true);
@@ -2691,7 +2766,7 @@ final public void TransactionOperations() throws ParseException {
       break;
       }
     default:
-      jj_la1[83] = jj_gen;
+      jj_la1[85] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -2755,27 +2830,27 @@ final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command
     TimestampSymbol timestamp;
     try {
       jj_consume_token(REVERT);
-      if (jj_2_24(3)) {
+      if (jj_2_25(3)) {
         key = Key();
         jj_consume_token(IN);
         record = jj_consume_token(NUMERIC);
-        timestamp = Timestamp();
+        timestamp = TimestampReadingCommand();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(key, Long.parseLong(record.image), timestamp));
-      } else if (jj_2_25(3)) {
+      } else if (jj_2_26(3)) {
         key = Key();
         jj_consume_token(IN);
         records = RecordCollection();
-        timestamp = Timestamp();
+        timestamp = TimestampReadingCommand();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(key, records, timestamp));
-      } else if (jj_2_26(3)) {
+      } else if (jj_2_27(3)) {
         keys = KeyCollection();
         jj_consume_token(IN);
         record = jj_consume_token(NUMERIC);
-        timestamp = Timestamp();
+        timestamp = TimestampReadingCommand();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
@@ -2785,14 +2860,14 @@ record = jj_consume_token(NUMERIC);
           keys = KeyCollection();
           jj_consume_token(IN);
           records = RecordCollection();
-          timestamp = Timestamp();
+          timestamp = TimestampReadingCommand();
 jjtree.closeNodeScope(jjtn000, true);
           jjtc000 = false;
 jjtn000.command(new RevertSymbol(keys, records, timestamp));
           break;
           }
         default:
-          jj_la1[84] = jj_gen;
+          jj_la1[86] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -2824,7 +2899,7 @@ record = jj_consume_token(NUMERIC);
     jj_consume_token(OPEN_BRACKET);
     record = jj_consume_token(NUMERIC);
 records.add(Long.parseLong(record.image));
-    label_10:
+    label_11:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -2832,8 +2907,8 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[85] = jj_gen;
-        break label_10;
+        jj_la1[87] = jj_gen;
+        break label_11;
       }
       jj_consume_token(COMMA);
       record = jj_consume_token(NUMERIC);
@@ -2849,7 +2924,7 @@ record = jj_consume_token(NUMERIC);
     jj_consume_token(OPEN_BRACKET);
     key = Key();
 keys.add(key.toString());
-    label_11:
+    label_12:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -2857,8 +2932,8 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[86] = jj_gen;
-        break label_11;
+        jj_la1[88] = jj_gen;
+        break label_12;
       }
       jj_consume_token(COMMA);
       key = Key();
@@ -3083,21 +3158,29 @@ private boolean jj_2_26(int xla)
     finally { jj_save(25, xla); }
   }
 
+  private boolean jj_2_27(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_27()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(26, xla); }
+  }
+
   private boolean jj_3_4()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(67)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
+    if (jj_scan_token(68)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) return true;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
     }
     }
     }
@@ -3106,7 +3189,7 @@ private boolean jj_3_4()
     return false;
   }
 
-  private boolean jj_3R_62()
+  private boolean jj_3R_64()
  {
     Token xsp;
     if (jj_3_4()) return true;
@@ -3117,15 +3200,21 @@ private boolean jj_3R_62()
     return false;
   }
 
-  private boolean jj_3R_55()
+  private boolean jj_3R_40()
+ {
+    if (jj_3R_44()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_57()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_5()) {
     jj_scanpos = xsp;
-    if (jj_3R_62()) {
+    if (jj_3R_64()) {
     jj_scanpos = xsp;
-    if (jj_3R_63()) return true;
+    if (jj_3R_65()) return true;
     }
     }
     return false;
@@ -3133,13 +3222,13 @@ private boolean jj_3R_55()
 
   private boolean jj_3_5()
  {
-    if (jj_3R_18()) return true;
+    if (jj_3R_19()) return true;
     return false;
   }
 
-  private boolean jj_3R_41()
+  private boolean jj_3R_39()
  {
-    if (jj_scan_token(PAGE)) return true;
+    if (jj_3R_43()) return true;
     return false;
   }
 
@@ -3147,17 +3236,17 @@ private boolean jj_3_9()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(64)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(69)) {
+    if (jj_scan_token(65)) {
     jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(67)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) return true;
     }
     }
     }
@@ -3166,48 +3255,50 @@ private boolean jj_3_9()
     return false;
   }
 
-  private boolean jj_3R_38()
- {
-    if (jj_3R_42()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_37()
+  private boolean jj_3R_31()
  {
-    if (jj_3R_41()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_39()) {
+    jj_scanpos = xsp;
+    if (jj_3R_40()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_33()
+  private boolean jj_3R_34()
  {
     if (jj_scan_token(PERIOD_SEPARATED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_30()
+  private boolean jj_3R_36()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_37()) {
+    if (jj_scan_token(38)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(23)) {
     jj_scanpos = xsp;
-    if (jj_3R_38()) return true;
+    if (jj_scan_token(27)) return true;
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_32()
+  private boolean jj_3R_33()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(39)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(69)) {
+    if (jj_scan_token(40)) {
     jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(67)) {
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) return true;
+    if (jj_scan_token(72)) return true;
     }
     }
     }
@@ -3217,333 +3308,316 @@ private boolean jj_3R_32()
 
   private boolean jj_3_3()
  {
-    if (jj_3R_17()) return true;
+    if (jj_3R_18()) return true;
     return false;
   }
 
-  private boolean jj_3R_23()
+  private boolean jj_3R_24()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_3()) {
     jj_scanpos = xsp;
-    if (jj_3R_32()) {
+    if (jj_3R_33()) {
     jj_scanpos = xsp;
-    if (jj_3R_33()) return true;
+    if (jj_3R_34()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_31()
+  private boolean jj_3R_32()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(37)) {
+    if (jj_scan_token(38)) {
     jj_scanpos = xsp;
     if (jj_scan_token(23)) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_57()
+  private boolean jj_3R_23()
  {
-    if (jj_scan_token(BINARY_OPERATOR)) return true;
+    if (jj_scan_token(OPEN_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_47()
+  private boolean jj_3R_22()
  {
-    if (jj_3R_57()) return true;
-    if (jj_3R_58()) return true;
-    if (jj_3R_58()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_46()
+  private boolean jj_3_24()
  {
-    if (jj_3R_54()) return true;
-    if (jj_3R_55()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_56()) jj_scanpos = xsp;
+    if (jj_3R_24()) return true;
+    if (jj_scan_token(FROM)) return true;
     return false;
   }
 
-  private boolean jj_3R_45()
+  private boolean jj_3R_59()
  {
-    if (jj_3R_51()) return true;
-    if (jj_3R_52()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_53()) jj_scanpos = xsp;
+    if (jj_scan_token(BINARY_OPERATOR)) return true;
     return false;
   }
 
-  private boolean jj_3R_22()
+  private boolean jj_3R_49()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_59()) return true;
+    if (jj_3R_60()) return true;
+    if (jj_3R_60()) return true;
     return false;
   }
 
-  private boolean jj_3R_44()
+  private boolean jj_3R_27()
  {
-    if (jj_3R_48()) return true;
-    if (jj_3R_49()) return true;
+    if (jj_3R_36()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_48()
+ {
+    if (jj_3R_56()) return true;
+    if (jj_3R_57()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_50()) jj_scanpos = xsp;
+    if (jj_3R_58()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_54()
+  private boolean jj_3R_47()
  {
+    if (jj_3R_53()) return true;
+    if (jj_3R_54()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(42)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(44)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(45)) return true;
-    }
-    }
+    if (jj_3R_55()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_21()
+  private boolean jj_3_13()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
+    }
+    }
+    }
+    if (jj_scan_token(COMMA)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_22()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(67)) return true;
+    if (jj_3R_23()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_16()
+  private boolean jj_3R_21()
  {
-    if (jj_3R_30()) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  private boolean jj_3_23()
+  private boolean jj_3R_46()
  {
-    if (jj_3R_23()) return true;
-    if (jj_scan_token(FROM)) return true;
+    if (jj_3R_50()) return true;
+    if (jj_3R_51()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_52()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_36()
+  private boolean jj_3R_56()
  {
-    if (jj_scan_token(CONJUNCTION)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(43)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(45)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(46)) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_28()
+  private boolean jj_3R_20()
  {
-    if (jj_scan_token(DISJUNCTION)) return true;
+    if (jj_scan_token(CLOSE_PARENTHESES)) return true;
     return false;
   }
 
-  private boolean jj_3R_26()
+  private boolean jj_3R_17()
  {
     if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_43()
+  private boolean jj_3R_38()
  {
-    if (jj_3R_23()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_44()) {
-    jj_scanpos = xsp;
-    if (jj_3R_45()) {
-    jj_scanpos = xsp;
-    if (jj_3R_46()) {
-    jj_scanpos = xsp;
-    if (jj_3R_47()) return true;
-    }
-    }
-    }
+    if (jj_scan_token(CONJUNCTION)) return true;
     return false;
   }
 
-  private boolean jj_3R_20()
+  private boolean jj_3R_29()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_31()) return true;
+    if (jj_scan_token(DISJUNCTION)) return true;
     return false;
   }
 
-  private boolean jj_3_12()
+  private boolean jj_3R_45()
  {
+    if (jj_3R_24()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
+    if (jj_3R_46()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
+    if (jj_3R_47()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_3R_48()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) return true;
+    if (jj_3R_49()) return true;
     }
     }
     }
-    if (jj_scan_token(COMMA)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_21()) {
-    jj_scanpos = xsp;
-    if (jj_3R_22()) return true;
-    }
     return false;
   }
 
-  private boolean jj_3R_51()
+  private boolean jj_3R_53()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(53)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(54)) {
     jj_scanpos = xsp;
     if (jj_scan_token(55)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(56)) return true;
+    if (jj_scan_token(56)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(57)) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_19()
- {
-    if (jj_scan_token(CLOSE_PARENTHESES)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_15()
+  private boolean jj_3_12()
  {
-    if (jj_3R_29()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
+    }
+    }
+    }
+    xsp = jj_scanpos;
+    if (jj_3R_20()) {
+    jj_scanpos = xsp;
+    if (jj_3R_21()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_48()
+  private boolean jj_3R_16()
  {
-    if (jj_scan_token(LINKS_TO)) return true;
+    if (jj_3R_30()) return true;
     return false;
   }
 
-  private boolean jj_3R_35()
+  private boolean jj_3_23()
  {
+    if (jj_scan_token(NUMERIC)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_39()) {
-    jj_scanpos = xsp;
-    if (jj_3R_40()) return true;
-    }
+    if (jj_3R_27()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_39()
+  private boolean jj_3R_19()
  {
+    if (jj_scan_token(ALPHANUMERIC)) return true;
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    if (jj_3R_12()) return true;
     return false;
   }
 
-  private boolean jj_3R_14()
+  private boolean jj_3R_50()
  {
-    if (jj_3R_30()) return true;
+    if (jj_scan_token(LINKS_TO)) return true;
     return false;
   }
 
-  private boolean jj_3_11()
+  private boolean jj_3R_37()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) return true;
-    }
-    }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_19()) {
+    if (jj_3R_41()) {
     jj_scanpos = xsp;
-    if (jj_3R_20()) return true;
+    if (jj_3R_42()) return true;
     }
     return false;
   }
 
-  private boolean jj_3_22()
- {
-    if (jj_scan_token(NUMERIC)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_26()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_18()
+  private boolean jj_3R_41()
  {
-    if (jj_scan_token(ALPHANUMERIC)) return true;
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
+    if (jj_3R_13()) return true;
     return false;
   }
 
-  private boolean jj_3R_65()
- {
-    if (jj_scan_token(QUOTED_STRING)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_27()
+  private boolean jj_3R_15()
  {
-    if (jj_3R_35()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_36()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_31()) return true;
     return false;
   }
 
-  private boolean jj_3R_13()
+  private boolean jj_3R_67()
  {
-    if (jj_3R_29()) return true;
+    if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_12()
+  private boolean jj_3R_28()
  {
-    if (jj_3R_27()) return true;
+    if (jj_3R_37()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_28()) { jj_scanpos = xsp; break; }
+      if (jj_3R_38()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_17()
+  private boolean jj_3R_18()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(67)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) return true;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
     }
     }
     }
@@ -3553,55 +3627,86 @@ private boolean jj_3R_17()
     return false;
   }
 
-  private boolean jj_3_21()
+  private boolean jj_3R_14()
  {
-    if (jj_3R_25()) return true;
+    if (jj_3R_30()) return true;
     return false;
   }
 
-  private boolean jj_3_2()
+  private boolean jj_3R_13()
  {
+    if (jj_3R_28()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(38)) jj_scanpos = xsp;
-    if (jj_3R_12()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_15()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_16()) jj_scanpos = xsp;
-    if (jj_scan_token(0)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_29()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3_10()
+  private boolean jj_3_22()
  {
-    if (jj_3R_17()) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3_20()
+  private boolean jj_3_11()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_18()) return true;
+    return false;
+  }
+
+  private boolean jj_3_21()
+ {
+    if (jj_3R_24()) return true;
     if (jj_scan_token(FROM)) return true;
+    if (jj_3R_25()) return true;
+    return false;
+  }
+
+  private boolean jj_3_20()
+ {
     if (jj_3R_24()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_64()
+  private boolean jj_3R_35()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    return false;
+  }
+
+  private boolean jj_3_2()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(39)) jj_scanpos = xsp;
+    if (jj_3R_13()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_16()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_17()) jj_scanpos = xsp;
+    if (jj_scan_token(0)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_66()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(67)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
+    if (jj_scan_token(68)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) return true;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) return true;
     }
     }
     }
@@ -3610,23 +3715,28 @@ private boolean jj_3R_64()
     return false;
   }
 
-  private boolean jj_3_19()
+  private boolean jj_3R_26()
  {
-    if (jj_3R_23()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_24()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_35()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(CLOSE_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_58()
+  private boolean jj_3R_60()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_8()) {
     jj_scanpos = xsp;
-    if (jj_3R_64()) {
+    if (jj_3R_66()) {
     jj_scanpos = xsp;
-    if (jj_3R_65()) return true;
+    if (jj_3R_67()) return true;
     }
     }
     return false;
@@ -3634,26 +3744,13 @@ private boolean jj_3R_58()
 
   private boolean jj_3_8()
  {
-    if (jj_3R_18()) return true;
+    if (jj_3R_19()) return true;
     return false;
   }
 
-  private boolean jj_3R_34()
+  private boolean jj_3_16()
  {
-    if (jj_scan_token(COMMA)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_25()
- {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
-    if (jj_3R_23()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_34()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(CLOSE_BRACKET)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
@@ -3661,96 +3758,77 @@ private boolean jj_3_1()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(38)) jj_scanpos = xsp;
-    if (jj_3R_12()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_13()) jj_scanpos = xsp;
+    if (jj_scan_token(39)) jj_scanpos = xsp;
+    if (jj_3R_13()) return true;
     xsp = jj_scanpos;
     if (jj_3R_14()) jj_scanpos = xsp;
-    if (jj_scan_token(78)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_15()) jj_scanpos = xsp;
+    if (jj_scan_token(79)) return true;
     return false;
   }
 
-  private boolean jj_3R_61()
+  private boolean jj_3R_25()
  {
-    if (jj_scan_token(QUOTED_STRING)) return true;
+    if (jj_scan_token(OPEN_BRACKET)) return true;
     return false;
   }
 
   private boolean jj_3_15()
  {
+    if (jj_3R_24()) return true;
+    if (jj_scan_token(FROM)) return true;
     if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3_6()
+  private boolean jj_3R_63()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(67)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(79)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_24()
+  private boolean jj_3_19()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
   private boolean jj_3_14()
  {
-    if (jj_3R_23()) return true;
-    if (jj_scan_token(FROM)) return true;
     if (jj_3R_24()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
   private boolean jj_3_18()
  {
+    if (jj_3R_24()) return true;
+    if (jj_scan_token(FROM)) return true;
     if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3_7()
+  private boolean jj_3_6()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(69)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(70)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(67)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(71)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
+    if (jj_scan_token(68)) {
     jj_scanpos = xsp;
     if (jj_scan_token(72)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(79)) {
+    if (jj_scan_token(74)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(80)) return true;
+    if (jj_scan_token(81)) return true;
     }
     }
     }
@@ -3761,48 +3839,69 @@ private boolean jj_3_7()
     return false;
   }
 
-  private boolean jj_3R_60()
+  private boolean jj_3_7()
  {
     Token xsp;
-    if (jj_3_7()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_7()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(73)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(81)) return true;
+    }
+    }
+    }
+    }
+    }
+    }
     }
     return false;
   }
 
-  private boolean jj_3_13()
+  private boolean jj_3_17()
  {
-    if (jj_3R_23()) return true;
+    if (jj_3R_24()) return true;
     if (jj_scan_token(FROM)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_17()
+  private boolean jj_3R_62()
  {
-    if (jj_3R_23()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_3R_24()) return true;
+    Token xsp;
+    if (jj_3_7()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_7()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3_16()
+  private boolean jj_3_27()
  {
-    if (jj_3R_23()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
   private boolean jj_3_26()
  {
+    if (jj_3R_24()) return true;
+    if (jj_scan_token(IN)) return true;
     if (jj_3R_25()) return true;
     return false;
   }
 
-  private boolean jj_3R_59()
+  private boolean jj_3R_61()
  {
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
     Token xsp;
@@ -3814,15 +3913,15 @@ private boolean jj_3R_59()
     return false;
   }
 
-  private boolean jj_3R_52()
+  private boolean jj_3R_54()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_59()) {
+    if (jj_3R_61()) {
     jj_scanpos = xsp;
-    if (jj_3R_60()) {
+    if (jj_3R_62()) {
     jj_scanpos = xsp;
-    if (jj_3R_61()) return true;
+    if (jj_3R_63()) return true;
     }
     }
     return false;
@@ -3830,65 +3929,86 @@ private boolean jj_3R_52()
 
   private boolean jj_3_25()
  {
-    if (jj_3R_23()) return true;
-    if (jj_scan_token(IN)) return true;
     if (jj_3R_24()) return true;
+    if (jj_scan_token(IN)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_24()
+  private boolean jj_3R_51()
  {
-    if (jj_3R_23()) return true;
-    if (jj_scan_token(IN)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_49()
+  private boolean jj_3R_30()
  {
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_scan_token(ORDER)) return true;
     return false;
   }
 
-  private boolean jj_3R_63()
+  private boolean jj_3R_65()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_29()
+  private boolean jj_3R_44()
  {
-    if (jj_scan_token(ORDER)) return true;
+    if (jj_scan_token(SIZE)) return true;
     return false;
   }
 
-  private boolean jj_3R_53()
+  private boolean jj_3_10()
  {
-    if (jj_3R_31()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(65)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(70)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(71)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(68)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(72)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(74)) return true;
+    }
+    }
+    }
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_56()
+  private boolean jj_3R_55()
  {
-    if (jj_3R_31()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  private boolean jj_3R_40()
+  private boolean jj_3R_58()
  {
-    if (jj_3R_43()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
-  private boolean jj_3R_50()
+  private boolean jj_3R_52()
  {
-    if (jj_3R_31()) return true;
+    if (jj_3R_32()) return true;
     return false;
   }
 
   private boolean jj_3R_42()
  {
-    if (jj_scan_token(SIZE)) return true;
+    if (jj_3R_45()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_43()
+ {
+    if (jj_scan_token(PAGE)) return true;
     return false;
   }
 
@@ -3903,7 +4023,7 @@ private boolean jj_3R_42()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[87];
+  final private int[] jj_la1 = new int[89];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -3913,15 +4033,15 @@ private boolean jj_3R_42()
 	   jj_la1_init_2();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x7ffff8,0x0,0x0,0x0,0x0,0x7ffff8,0x0,0x0,0x0,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x8000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x800000,0x800000,0x800000,0x800000,0x800000,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x800000,0x800000,0x0,0x0,0x800000,0x380000,0x0,0x0,0x0,};
+	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x7ffff8,0x0,0x0,0x0,0x0,0x7ffff8,0x0,0x0,0x0,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x8800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x10000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x8800000,0x8800000,0x8800000,0x8800000,0x8800000,0x0,0x8800000,0x8800000,0x8800000,0x8800000,0x0,0x8800000,0x8800000,0x0,0x0,0x8800000,0x380000,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x40,0x10000000,0xc000000,0x0,0x1c000000,0x40,0x10000000,0xc000000,0x0,0x1c000000,0x200,0x100,0x82,0x20,0x20,0x20,0x20,0x1f03c00,0x80,0x80,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x1e00000,0x3400,0x20,0x0,0x8000000,0x4000000,0xc000000,0x0,0x60000000,0x3080,0x20,0x3000,0x60000000,0x0,0x0,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x4,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x20,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x20,0x20,0x8,0x20,0x20,0x8,0x0,0x20,0x0,0x8,0x0,0x0,};
+	   jj_la1_1 = new int[] {0x80,0x20000000,0x18000000,0x0,0x38000000,0x80,0x20000000,0x18000000,0x0,0x38000000,0x400,0x200,0x104,0x40,0x40,0x40,0x40,0x3e07800,0x100,0x100,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x3c00000,0x6800,0x40,0x0,0x40,0x0,0x10000000,0x8000000,0x18000000,0x0,0xc0000000,0x6100,0x40,0x6000,0xc0000000,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x0,0x0,0x10,0x10,0x0,0x40,0x40,0x40,0x40,0x40,0x10,0x40,0x40,0x40,0x40,0x10,0x40,0x40,0x10,0x0,0x40,0x0,0x10,0x0,0x0,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x1e8,0x0,0x0,0x0,0x0,0x1e8,0x0,0x0,0x1e8,0x0,0x0,0x0,0x0,0x0,0xe8,0x1e8,0x3e8,0x3e9,0x183e8,0x183e8,0x183e9,0x3e8,0x3e9,0x0,0x0,0x0,0x2e9,0x0,0x0,0x0,0x10,0x0,0x1e8,0x0,0x0,0x0,0x80,0x1e8,0x1e0,0x10,0x1e0,0x28,0x10,0x28,0x28,0x10,0x28,0x28,0x1e0,0x10,0x1e0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x8,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x10,0x10,};
+	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x3d0,0x0,0x0,0x0,0x0,0x3d0,0x0,0x0,0x3d0,0x0,0x0,0x0,0x0,0x0,0x1d0,0x3d0,0x7d0,0x7d2,0x307d0,0x307d0,0x307d2,0x7d0,0x7d2,0x0,0x0,0x0,0x5d2,0x0,0x5d2,0x0,0x0,0x0,0x20,0x0,0x3d0,0x0,0x0,0x0,0x100,0x3d0,0x3c0,0x20,0x3c0,0x50,0x20,0x50,0x50,0x20,0x50,0x50,0x3c0,0x20,0x3c0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x20,0x20,};
 	}
-  final private JJCalls[] jj_2_rtns = new JJCalls[26];
+  final private JJCalls[] jj_2_rtns = new JJCalls[27];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
@@ -3936,7 +4056,7 @@ public Grammar(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -3952,7 +4072,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -3963,7 +4083,7 @@ public Grammar(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -3983,7 +4103,7 @@ public void ReInit(java.io.Reader stream) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -3993,7 +4113,7 @@ public Grammar(GrammarTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4004,7 +4124,7 @@ public void ReInit(GrammarTokenManager tm) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 87; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4130,12 +4250,12 @@ private void jj_add_error_token(int kind, int pos) {
   /** Generate ParseException. */
   public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[81];
+	 boolean[] la1tokens = new boolean[82];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 87; i++) {
+	 for (int i = 0; i < 89; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4150,7 +4270,7 @@ public ParseException generateParseException() {
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 81; i++) {
+	 for (int i = 0; i < 82; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
@@ -4185,7 +4305,7 @@ final public void disable_tracing() {
 
   private void jj_rescan_token() {
 	 jj_rescan = true;
-	 for (int i = 0; i < 26; i++) {
+	 for (int i = 0; i < 27; i++) {
 	   try {
 		 JJCalls p = jj_2_rtns[i];
 
@@ -4219,6 +4339,7 @@ private void jj_rescan_token() {
 			   case 23: jj_3_24(); break;
 			   case 24: jj_3_25(); break;
 			   case 25: jj_3_26(); break;
+			   case 26: jj_3_27(); break;
 			 }
 		   }
 		   p = p.next;
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
index 7bdb7f80..4d3eabd6 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
@@ -59,107 +59,109 @@ public interface GrammarConstants {
   /** RegularExpression Id. */
   int TO = 26;
   /** RegularExpression Id. */
-  int AS = 27;
+  int AS_OF = 27;
   /** RegularExpression Id. */
-  int FOR = 28;
+  int AS = 28;
   /** RegularExpression Id. */
-  int WITH = 29;
+  int FOR = 29;
   /** RegularExpression Id. */
-  int OPEN_BRACE = 30;
+  int WITH = 30;
   /** RegularExpression Id. */
-  int CLOSE_BRACE = 31;
+  int OPEN_BRACE = 31;
   /** RegularExpression Id. */
-  int COLON = 32;
+  int CLOSE_BRACE = 32;
   /** RegularExpression Id. */
-  int OPEN_PARENTHESES = 33;
+  int COLON = 33;
   /** RegularExpression Id. */
-  int CLOSE_PARENTHESES = 34;
+  int OPEN_PARENTHESES = 34;
   /** RegularExpression Id. */
-  int OPEN_BRACKET = 35;
+  int CLOSE_PARENTHESES = 35;
   /** RegularExpression Id. */
-  int CLOSE_BRACKET = 36;
+  int OPEN_BRACKET = 36;
   /** RegularExpression Id. */
-  int TIMESTAMP = 37;
+  int CLOSE_BRACKET = 37;
   /** RegularExpression Id. */
-  int WHERE = 38;
+  int TIMESTAMP = 38;
   /** RegularExpression Id. */
-  int RESERVED_IDENTIFIER = 39;
+  int WHERE = 39;
   /** RegularExpression Id. */
-  int CONJUNCTION = 40;
+  int RESERVED_IDENTIFIER = 40;
   /** RegularExpression Id. */
-  int DISJUNCTION = 41;
+  int CONJUNCTION = 41;
   /** RegularExpression Id. */
-  int UNARY_OPERATOR = 42;
+  int DISJUNCTION = 42;
   /** RegularExpression Id. */
-  int BINARY_OPERATOR = 43;
+  int UNARY_OPERATOR = 43;
   /** RegularExpression Id. */
-  int OPEN_ANGLE_BRACKET = 44;
+  int BINARY_OPERATOR = 44;
   /** RegularExpression Id. */
-  int CLOSE_ANGLE_BRACKET = 45;
+  int OPEN_ANGLE_BRACKET = 45;
   /** RegularExpression Id. */
-  int EQUALS = 46;
+  int CLOSE_ANGLE_BRACKET = 46;
   /** RegularExpression Id. */
-  int NOT_EQUALS = 47;
+  int EQUALS = 47;
   /** RegularExpression Id. */
-  int GREATER_THAN = 48;
+  int NOT_EQUALS = 48;
   /** RegularExpression Id. */
-  int GREATER_THAN_OR_EQUALS = 49;
+  int GREATER_THAN = 49;
   /** RegularExpression Id. */
-  int LESS_THAN = 50;
+  int GREATER_THAN_OR_EQUALS = 50;
   /** RegularExpression Id. */
-  int LESS_THAN_OR_EQUALS = 51;
+  int LESS_THAN = 51;
   /** RegularExpression Id. */
-  int LINKS_TO = 52;
+  int LESS_THAN_OR_EQUALS = 52;
   /** RegularExpression Id. */
-  int REGEX = 53;
+  int LINKS_TO = 53;
   /** RegularExpression Id. */
-  int NOT_REGEX = 54;
+  int REGEX = 54;
   /** RegularExpression Id. */
-  int LIKE = 55;
+  int NOT_REGEX = 55;
   /** RegularExpression Id. */
-  int NOT_LIKE = 56;
+  int LIKE = 56;
   /** RegularExpression Id. */
-  int BETWEEN = 57;
+  int NOT_LIKE = 57;
   /** RegularExpression Id. */
-  int PAGE = 58;
+  int BETWEEN = 58;
   /** RegularExpression Id. */
-  int SIZE = 59;
+  int PAGE = 59;
   /** RegularExpression Id. */
-  int ORDER = 60;
+  int SIZE = 60;
   /** RegularExpression Id. */
-  int ASC = 61;
+  int ORDER = 61;
   /** RegularExpression Id. */
-  int DESC = 62;
+  int ASC = 62;
   /** RegularExpression Id. */
-  int PIPE = 63;
+  int DESC = 63;
   /** RegularExpression Id. */
-  int QUOTED_STRING = 64;
+  int PIPE = 64;
   /** RegularExpression Id. */
-  int DOUBLE_QUOTED_STRING = 65;
+  int QUOTED_STRING = 65;
   /** RegularExpression Id. */
-  int SINGLE_QUOTED_STRING = 66;
+  int DOUBLE_QUOTED_STRING = 66;
   /** RegularExpression Id. */
-  int NUMERIC = 67;
+  int SINGLE_QUOTED_STRING = 67;
   /** RegularExpression Id. */
-  int COMMA = 68;
+  int NUMERIC = 68;
   /** RegularExpression Id. */
-  int SIGNED_INTEGER = 69;
+  int COMMA = 69;
   /** RegularExpression Id. */
-  int SIGNED_DECIMAL = 70;
+  int SIGNED_INTEGER = 70;
   /** RegularExpression Id. */
-  int ALPHANUMERIC = 71;
+  int SIGNED_DECIMAL = 71;
   /** RegularExpression Id. */
-  int PERIOD_SEPARATED_STRING = 72;
+  int ALPHANUMERIC = 72;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 73;
+  int PERIOD_SEPARATED_STRING = 73;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC = 74;
+  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 74;
   /** RegularExpression Id. */
-  int LETTER = 75;
+  int NON_ALPHANUMERIC = 75;
   /** RegularExpression Id. */
-  int DIGIT = 76;
+  int LETTER = 76;
   /** RegularExpression Id. */
-  int PERIOD = 77;
+  int DIGIT = 77;
+  /** RegularExpression Id. */
+  int PERIOD = 78;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -193,6 +195,7 @@ public interface GrammarConstants {
     "\"into\"",
     "\"from\"",
     "\"to\"",
+    "\"as of\"",
     "\"as\"",
     "\"for\"",
     "\"with\"",
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
index 577de0c6..729489e6 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
@@ -55,56 +55,56 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 2;
          return jjMoveNfa_0(5, 0);
       case 10:
-         jjmatchedKind = 78;
+         jjmatchedKind = 79;
          return jjMoveNfa_0(5, 0);
       case 32:
          jjmatchedKind = 1;
          return jjMoveNfa_0(5, 0);
       case 36:
-         return jjMoveStringLiteralDfa1_0(0x8000000000L);
+         return jjMoveStringLiteralDfa1_0(0x10000000000L);
       case 40:
-         jjmatchedKind = 33;
+         jjmatchedKind = 34;
          return jjMoveNfa_0(5, 0);
       case 41:
-         jjmatchedKind = 34;
+         jjmatchedKind = 35;
          return jjMoveNfa_0(5, 0);
       case 44:
-         jjmatchedKind = 68;
+         jjmatchedKind = 69;
          return jjMoveNfa_0(5, 0);
       case 58:
-         jjmatchedKind = 32;
+         jjmatchedKind = 33;
          return jjMoveNfa_0(5, 0);
       case 60:
-         jjmatchedKind = 44;
+         jjmatchedKind = 45;
          return jjMoveNfa_0(5, 0);
       case 61:
-         jjmatchedKind = 80;
+         jjmatchedKind = 81;
          return jjMoveNfa_0(5, 0);
       case 62:
-         jjmatchedKind = 45;
+         jjmatchedKind = 46;
          return jjMoveNfa_0(5, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x2000000008210008L);
+         return jjMoveStringLiteralDfa1_0(0x4000000018210008L);
       case 67:
          return jjMoveStringLiteralDfa1_0(0x100040L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x4000000000008000L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000008000L);
       case 70:
-         return jjMoveStringLiteralDfa1_0(0x12002000L);
+         return jjMoveStringLiteralDfa1_0(0x22002000L);
       case 71:
          return jjMoveStringLiteralDfa1_0(0x4000L);
       case 73:
          return jjMoveStringLiteralDfa1_0(0x1800200L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x80000000000400L);
+         return jjMoveStringLiteralDfa1_0(0x100000000000400L);
       case 79:
-         return jjMoveStringLiteralDfa1_0(0x1000000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000000L);
       case 80:
-         return jjMoveStringLiteralDfa1_0(0x400000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x800000000000000L);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x20000000400020L);
+         return jjMoveStringLiteralDfa1_0(0x40000000400020L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0x8000000000c1010L);
+         return jjMoveStringLiteralDfa1_0(0x10000000000c1010L);
       case 84:
          return jjMoveStringLiteralDfa1_0(0x4000000L);
       case 85:
@@ -112,38 +112,38 @@ private int jjMoveStringLiteralDfa0_0(){
       case 86:
          return jjMoveStringLiteralDfa1_0(0x20000L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x4020000000L);
+         return jjMoveStringLiteralDfa1_0(0x8040000000L);
       case 91:
-         jjmatchedKind = 35;
+         jjmatchedKind = 36;
          return jjMoveNfa_0(5, 0);
       case 93:
-         jjmatchedKind = 36;
+         jjmatchedKind = 37;
          return jjMoveNfa_0(5, 0);
       case 95:
-         jjmatchedKind = 79;
+         jjmatchedKind = 80;
          return jjMoveNfa_0(5, 0);
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x2000000008210008L);
+         return jjMoveStringLiteralDfa1_0(0x4000000018210008L);
       case 99:
          return jjMoveStringLiteralDfa1_0(0x100040L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x4000000000008000L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000008000L);
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x12002000L);
+         return jjMoveStringLiteralDfa1_0(0x22002000L);
       case 103:
          return jjMoveStringLiteralDfa1_0(0x4000L);
       case 105:
          return jjMoveStringLiteralDfa1_0(0x1800200L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x80000000000400L);
+         return jjMoveStringLiteralDfa1_0(0x100000000000400L);
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x1000000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000000L);
       case 112:
-         return jjMoveStringLiteralDfa1_0(0x400000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x800000000000000L);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x20000000400020L);
+         return jjMoveStringLiteralDfa1_0(0x40000000400020L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x8000000000c1010L);
+         return jjMoveStringLiteralDfa1_0(0x10000000000c1010L);
       case 116:
          return jjMoveStringLiteralDfa1_0(0x4000000L);
       case 117:
@@ -151,15 +151,15 @@ private int jjMoveStringLiteralDfa0_0(){
       case 118:
          return jjMoveStringLiteralDfa1_0(0x20000L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x4020000000L);
+         return jjMoveStringLiteralDfa1_0(0x8040000000L);
       case 123:
-         jjmatchedKind = 30;
+         jjmatchedKind = 31;
          return jjMoveNfa_0(5, 0);
       case 124:
-         jjmatchedKind = 63;
+         jjmatchedKind = 64;
          return jjMoveNfa_0(5, 0);
       case 125:
-         jjmatchedKind = 31;
+         jjmatchedKind = 32;
          return jjMoveNfa_0(5, 0);
       default :
          return jjMoveNfa_0(5, 0);
@@ -173,17 +173,17 @@ private int jjMoveStringLiteralDfa1_0(long active0){
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
       case 66:
          return jjMoveStringLiteralDfa2_0(active0, 0x200000L);
       case 68:
          return jjMoveStringLiteralDfa2_0(active0, 0x8L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x402000000046f030L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x804000000046f030L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x880008020000400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1100010040000400L);
       case 76:
          return jjMoveStringLiteralDfa2_0(active0, 0x40L);
       case 78:
@@ -199,32 +199,32 @@ private int jjMoveStringLiteralDfa1_0(long active0){
             jjmatchedKind = 26;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x10100000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x20100000L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000000002000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000002000000L);
       case 83:
-         if ((active0 & 0x8000000L) != 0L)
+         if ((active0 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 27;
+            jjmatchedKind = 28;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000008000000L);
       case 84:
          return jjMoveStringLiteralDfa2_0(active0, 0x80000L);
       case 85:
          return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x400000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
       case 98:
          return jjMoveStringLiteralDfa2_0(active0, 0x200000L);
       case 100:
          return jjMoveStringLiteralDfa2_0(active0, 0x8L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x402000000046f030L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x804000000046f030L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x880008020000400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1100010040000400L);
       case 108:
          return jjMoveStringLiteralDfa2_0(active0, 0x40L);
       case 110:
@@ -240,16 +240,16 @@ private int jjMoveStringLiteralDfa1_0(long active0){
             jjmatchedKind = 26;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x10100000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x20100000L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000000002000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2000000002000000L);
       case 115:
-         if ((active0 & 0x8000000L) != 0L)
+         if ((active0 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 27;
+            jjmatchedKind = 28;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000008000000L);
       case 116:
          return jjMoveStringLiteralDfa2_0(active0, 0x80000L);
       case 117:
@@ -268,12 +268,14 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0){
    }
    switch(curChar)
    {
+      case 32:
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000L);
       case 65:
          return jjMoveStringLiteralDfa3_0(active0, 0xc0000L);
       case 67:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active0 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 62;
             jjmatchedPos = 2;
          }
          break;
@@ -283,13 +285,13 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0){
             jjmatchedKind = 3;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000008000010000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000010000010000L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000040L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000040L);
       case 71:
-         return jjMoveStringLiteralDfa3_0(active0, 0x420000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000000L);
       case 75:
-         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L);
       case 76:
          return jjMoveStringLiteralDfa3_0(active0, 0x1800L);
       case 77:
@@ -299,14 +301,14 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0){
       case 79:
          return jjMoveStringLiteralDfa3_0(active0, 0x2200000L);
       case 82:
-         if ((active0 & 0x10000000L) != 0L)
+         if ((active0 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 29;
             jjmatchedPos = 2;
          }
          return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
       case 83:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000008200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000008200L);
       case 84:
          if ((active0 & 0x10L) != 0L)
          {
@@ -318,17 +320,17 @@ else if ((active0 & 0x4000L) != 0L)
             jjmatchedKind = 14;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x21002000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x41002000L);
       case 86:
          return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
       case 90:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L);
       case 97:
          return jjMoveStringLiteralDfa3_0(active0, 0xc0000L);
       case 99:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active0 & 0x4000000000000000L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 62;
             jjmatchedPos = 2;
          }
          break;
@@ -338,13 +340,13 @@ else if ((active0 & 0x4000L) != 0L)
             jjmatchedKind = 3;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000008000010000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000010000010000L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000040L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000040L);
       case 103:
-         return jjMoveStringLiteralDfa3_0(active0, 0x420000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000000L);
       case 107:
-         return jjMoveStringLiteralDfa3_0(active0, 0x80000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L);
       case 108:
          return jjMoveStringLiteralDfa3_0(active0, 0x1800L);
       case 109:
@@ -354,14 +356,14 @@ else if ((active0 & 0x4000L) != 0L)
       case 111:
          return jjMoveStringLiteralDfa3_0(active0, 0x2200000L);
       case 114:
-         if ((active0 & 0x10000000L) != 0L)
+         if ((active0 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 29;
             jjmatchedPos = 2;
          }
          return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
       case 115:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000008200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000008200L);
       case 116:
          if ((active0 & 0x10L) != 0L)
          {
@@ -373,11 +375,11 @@ else if ((active0 & 0x4000L) != 0L)
             jjmatchedKind = 14;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x21002000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x41002000L);
       case 118:
          return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
       case 122:
-         return jjMoveStringLiteralDfa3_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L);
       default :
          break;
    }
@@ -393,44 +395,44 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0){
    switch(curChar)
    {
       case 36:
-         if ((active0 & 0x8000000000L) != 0L)
+         if ((active0 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 40;
             jjmatchedPos = 3;
          }
          break;
       case 65:
          return jjMoveStringLiteralDfa4_0(active0, 0x40L);
       case 67:
-         if ((active0 & 0x4000000000000000L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 63;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0xa000L);
       case 69:
-         if ((active0 & 0x80000000000000L) != 0L)
+         if ((active0 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 56;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x400000000000000L) != 0L)
+         else if ((active0 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 59;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x800000000000000L) != 0L)
+         else if ((active0 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1020000000401200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2040000000401200L);
       case 71:
          return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
       case 72:
-         if ((active0 & 0x20000000L) != 0L)
+         if ((active0 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 29;
+            jjmatchedKind = 30;
             jjmatchedPos = 3;
          }
          break;
@@ -456,41 +458,41 @@ else if ((active0 & 0x800000000000000L) != 0L)
             jjmatchedKind = 24;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000020L);
       case 82:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000240000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000240000L);
       case 97:
          return jjMoveStringLiteralDfa4_0(active0, 0x40L);
       case 99:
-         if ((active0 & 0x4000000000000000L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 63;
             jjmatchedPos = 3;
          }
          return jjMoveStringLiteralDfa4_0(active0, 0xa000L);
       case 101:
-         if ((active0 & 0x80000000000000L) != 0L)
+         if ((active0 & 0x100000000000000L) != 0L)
          {
-            jjmatchedKind = 55;
+            jjmatchedKind = 56;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x400000000000000L) != 0L)
+         else if ((active0 & 0x800000000000000L) != 0L)
          {
-            jjmatchedKind = 58;
+            jjmatchedKind = 59;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x800000000000000L) != 0L)
+         else if ((active0 & 0x1000000000000000L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 60;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1020000000401200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2040000000401200L);
       case 103:
          return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
       case 104:
-         if ((active0 & 0x20000000L) != 0L)
+         if ((active0 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 29;
+            jjmatchedKind = 30;
             jjmatchedPos = 3;
          }
          break;
@@ -516,9 +518,9 @@ else if ((active0 & 0x800000000000000L) != 0L)
             jjmatchedKind = 24;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000020L);
       case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0x4000240000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000240000L);
       default :
          break;
    }
@@ -541,13 +543,18 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0){
             jjmatchedKind = 19;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x4000000000L) != 0L)
+         else if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 38;
+            jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
          break;
       case 70:
+         if ((active0 & 0x8000000L) != 0L)
+         {
+            jjmatchedKind = 27;
+            jjmatchedPos = 4;
+         }
          return jjMoveStringLiteralDfa5_0(active0, 0x20000L);
       case 72:
          if ((active0 & 0x2000L) != 0L)
@@ -566,7 +573,7 @@ else if ((active0 & 0x4000000000L) != 0L)
             jjmatchedKind = 6;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000408200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000408200L);
       case 84:
          if ((active0 & 0x10000L) != 0L)
          {
@@ -582,9 +589,9 @@ else if ((active0 & 0x200000L) != 0L)
       case 86:
          return jjMoveStringLiteralDfa5_0(active0, 0x20L);
       case 88:
-         if ((active0 & 0x20000000000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 53;
+            jjmatchedKind = 54;
             jjmatchedPos = 4;
          }
          break;
@@ -596,13 +603,18 @@ else if ((active0 & 0x200000L) != 0L)
             jjmatchedKind = 19;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x4000000000L) != 0L)
+         else if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 38;
+            jjmatchedKind = 39;
             jjmatchedPos = 4;
          }
          break;
       case 102:
+         if ((active0 & 0x8000000L) != 0L)
+         {
+            jjmatchedKind = 27;
+            jjmatchedPos = 4;
+         }
          return jjMoveStringLiteralDfa5_0(active0, 0x20000L);
       case 104:
          if ((active0 & 0x2000L) != 0L)
@@ -621,7 +633,7 @@ else if ((active0 & 0x4000000000L) != 0L)
             jjmatchedKind = 6;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x1000000000408200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000408200L);
       case 116:
          if ((active0 & 0x10000L) != 0L)
          {
@@ -637,9 +649,9 @@ else if ((active0 & 0x200000L) != 0L)
       case 118:
          return jjMoveStringLiteralDfa5_0(active0, 0x20L);
       case 120:
-         if ((active0 & 0x20000000000000L) != 0L)
+         if ((active0 & 0x40000000000000L) != 0L)
          {
-            jjmatchedKind = 53;
+            jjmatchedKind = 54;
             jjmatchedPos = 4;
          }
          break;
@@ -658,7 +670,7 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0){
    switch(curChar)
    {
       case 32:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L);
       case 69:
          if ((active0 & 0x20L) != 0L)
          {
@@ -778,9 +790,9 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0){
    switch(curChar)
    {
       case 66:
-         return jjMoveStringLiteralDfa7_0(active0, 0x1000000000008000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000008000L);
       case 98:
-         return jjMoveStringLiteralDfa7_0(active0, 0x1000000000008000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000008000L);
       default :
          break;
    }
@@ -803,9 +815,9 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0){
          }
          break;
       case 89:
-         if ((active0 & 0x1000000000000000L) != 0L)
+         if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 7;
          }
          break;
@@ -817,9 +829,9 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0){
          }
          break;
       case 121:
-         if ((active0 & 0x1000000000000000L) != 0L)
+         if ((active0 & 0x2000000000000000L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 61;
             jjmatchedPos = 7;
          }
          break;
@@ -865,7 +877,7 @@ private int jjMoveNfa_0(int startState, int curPos)
    catch(java.io.IOException e) { throw new Error("Internal Error"); }
    curPos = 0;
    int startsAt = 0;
-   jjnewStateCnt = 264;
+   jjnewStateCnt = 260;
    int i = 1;
    jjstateSet[0] = startState;
    int kind = 0x7fffffff;
@@ -883,19 +895,19 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 5:
                   if ((0xdfffecfeffffd9ffL & l) != 0L)
                   {
-                     if (kind > 73)
-                        kind = 73;
+                     if (kind > 74)
+                        kind = 74;
                      { jjCheckNAddTwoStates(18, 19); }
                   }
                   else if (curChar == 61)
                   {
-                     if (kind > 42)
-                        kind = 42;
+                     if (kind > 43)
+                        kind = 43;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 71)
-                        kind = 71;
+                     if (kind > 72)
+                        kind = 72;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0x280000000000L & l) != 0L)
@@ -905,7 +917,7 @@ else if (curChar == 39)
                   else if (curChar == 34)
                      { jjCheckNAddStates(12, 15); }
                   else if (curChar == 62)
-                     { jjCheckNAddTwoStates(11, 82); }
+                     { jjCheckNAddTwoStates(11, 78); }
                   else if (curChar == 60)
                      { jjCheckNAdd(11); }
                   else if (curChar == 33)
@@ -914,13 +926,13 @@ else if (curChar == 61)
                      { jjCheckNAdd(11); }
                   else if (curChar == 38)
                   {
-                     if (kind > 40)
-                        kind = 40;
+                     if (kind > 41)
+                        kind = 41;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 67)
-                        kind = 67;
+                     if (kind > 68)
+                        kind = 68;
                      { jjCheckNAddStates(16, 21); }
                   }
                   else if (curChar == 45)
@@ -929,28 +941,28 @@ else if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 6;
                   break;
                case 6:
-                  if (curChar == 38 && kind > 40)
-                     kind = 40;
+                  if (curChar == 38 && kind > 41)
+                     kind = 41;
                   break;
                case 7:
                   if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 6;
                   break;
                case 8:
-                  if (curChar == 38 && kind > 40)
-                     kind = 40;
+                  if (curChar == 38 && kind > 41)
+                     kind = 41;
                   break;
                case 11:
-                  if (curChar == 61 && kind > 42)
-                     kind = 42;
+                  if (curChar == 61 && kind > 43)
+                     kind = 43;
                   break;
                case 12:
                   if (curChar == 61)
                      { jjCheckNAdd(11); }
                   break;
                case 13:
-                  if (curChar == 61 && kind > 42)
-                     kind = 42;
+                  if (curChar == 61 && kind > 43)
+                     kind = 43;
                   break;
                case 14:
                   if (curChar == 33)
@@ -961,8 +973,8 @@ else if (curChar == 38)
                      { jjCheckNAdd(11); }
                   break;
                case 16:
-                  if (curChar == 62 && kind > 52)
-                     kind = 52;
+                  if (curChar == 62 && kind > 53)
+                     kind = 53;
                   break;
                case 17:
                   if (curChar == 45)
@@ -971,214 +983,210 @@ else if (curChar == 38)
                case 18:
                   if ((0xdfffecfeffffd9ffL & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 19:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 77:
-                  if (curChar == 32)
-                     jjstateSet[jjnewStateCnt++] = 76;
-                  break;
-               case 81:
                   if (curChar == 62)
-                     { jjCheckNAddTwoStates(11, 82); }
+                     { jjCheckNAddTwoStates(11, 78); }
                   break;
+               case 78:
+                  if (curChar == 60 && kind > 44)
+                     kind = 44;
+                  break;
+               case 81:
                case 82:
-                  if (curChar == 60 && kind > 43)
-                     kind = 43;
+                  { jjCheckNAddStates(22, 24); }
                   break;
                case 85:
                case 86:
-                  { jjCheckNAddStates(22, 24); }
-                  break;
-               case 89:
-               case 90:
                   { jjCheckNAddStates(25, 27); }
                   break;
-               case 92:
+               case 88:
                   if (curChar == 34)
                      { jjCheckNAddStates(12, 15); }
                   break;
-               case 94:
+               case 90:
                   { jjCheckNAddStates(28, 30); }
                   break;
-               case 95:
+               case 91:
                   if ((0xfffffffbffffffffL & l) != 0L)
                      { jjCheckNAddStates(28, 30); }
                   break;
-               case 96:
-                  if (curChar == 34 && kind > 64)
-                     kind = 64;
+               case 92:
+                  if (curChar == 34 && kind > 65)
+                     kind = 65;
                   break;
-               case 98:
+               case 94:
                   { jjCheckNAddStates(31, 33); }
                   break;
-               case 99:
+               case 95:
                   if ((0xfffffffbffffffffL & l) != 0L)
                      { jjCheckNAddStates(31, 33); }
                   break;
+               case 96:
+                  if (curChar == 34 && kind > 66)
+                     kind = 66;
+                  break;
+               case 99:
                case 100:
-                  if (curChar == 34 && kind > 65)
-                     kind = 65;
+                  { jjCheckNAddStates(34, 36); }
                   break;
                case 103:
                case 104:
-                  { jjCheckNAddStates(34, 36); }
+                  { jjCheckNAddStates(37, 39); }
                   break;
-               case 107:
                case 108:
-                  { jjCheckNAddStates(37, 39); }
+               case 109:
+                  { jjCheckNAddStates(40, 42); }
                   break;
                case 112:
                case 113:
-                  { jjCheckNAddStates(40, 42); }
-                  break;
-               case 116:
-               case 117:
                   { jjCheckNAddStates(43, 45); }
                   break;
-               case 119:
+               case 115:
                   if (curChar == 39)
                      { jjCheckNAddStates(8, 11); }
                   break;
-               case 121:
+               case 117:
                   { jjCheckNAddStates(46, 48); }
                   break;
-               case 122:
+               case 118:
                   if ((0xffffff7fffffffffL & l) != 0L)
                      { jjCheckNAddStates(46, 48); }
                   break;
-               case 123:
-                  if (curChar == 39 && kind > 64)
-                     kind = 64;
+               case 119:
+                  if (curChar == 39 && kind > 65)
+                     kind = 65;
                   break;
-               case 125:
+               case 121:
                   { jjCheckNAddStates(49, 51); }
                   break;
-               case 126:
+               case 122:
                   if ((0xffffff7fffffffffL & l) != 0L)
                      { jjCheckNAddStates(49, 51); }
                   break;
-               case 127:
-                  if (curChar == 39 && kind > 66)
-                     kind = 66;
+               case 123:
+                  if (curChar == 39 && kind > 67)
+                     kind = 67;
                   break;
-               case 128:
+               case 124:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
+                  if (kind > 68)
+                     kind = 68;
                   { jjCheckNAddStates(16, 21); }
                   break;
-               case 129:
+               case 125:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 67)
-                     kind = 67;
-                  { jjCheckNAdd(129); }
+                  if (kind > 68)
+                     kind = 68;
+                  { jjCheckNAdd(125); }
                   break;
-               case 130:
+               case 126:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 69)
-                     kind = 69;
-                  { jjCheckNAdd(130); }
+                  if (kind > 70)
+                     kind = 70;
+                  { jjCheckNAdd(126); }
                   break;
-               case 131:
+               case 127:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(131, 132); }
+                     { jjCheckNAddTwoStates(127, 128); }
                   break;
-               case 132:
+               case 128:
                   if (curChar == 46)
-                     { jjCheckNAdd(133); }
+                     { jjCheckNAdd(129); }
                   break;
-               case 133:
+               case 129:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 70)
-                     kind = 70;
-                  { jjCheckNAdd(133); }
+                  if (kind > 71)
+                     kind = 71;
+                  { jjCheckNAdd(129); }
                   break;
-               case 134:
+               case 130:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(134, 135); }
+                     { jjCheckNAddTwoStates(130, 131); }
                   break;
-               case 135:
+               case 131:
                   if (curChar == 46)
-                     { jjCheckNAdd(136); }
+                     { jjCheckNAdd(132); }
                   break;
-               case 136:
+               case 132:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
-                  { jjCheckNAddTwoStates(136, 137); }
+                  if (kind > 73)
+                     kind = 73;
+                  { jjCheckNAddTwoStates(132, 133); }
                   break;
-               case 137:
+               case 133:
                   if (curChar == 46)
                      { jjCheckNAddStates(52, 54); }
                   break;
-               case 138:
+               case 134:
                   if ((0x280000000000L & l) != 0L)
-                     { jjCheckNAdd(139); }
+                     { jjCheckNAdd(135); }
                   break;
-               case 139:
+               case 135:
                   if ((0x3ff000000000000L & l) != 0L)
-                     { jjCheckNAddTwoStates(139, 140); }
+                     { jjCheckNAddTwoStates(135, 136); }
                   break;
-               case 140:
+               case 136:
                   if (curChar == 46)
-                     { jjCheckNAdd(141); }
+                     { jjCheckNAdd(137); }
                   break;
-               case 141:
+               case 137:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
-                  { jjCheckNAddTwoStates(137, 141); }
+                  if (kind > 73)
+                     kind = 73;
+                  { jjCheckNAddTwoStates(133, 137); }
                   break;
-               case 142:
+               case 138:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
-                  { jjCheckNAddTwoStates(137, 142); }
+                  if (kind > 73)
+                     kind = 73;
+                  { jjCheckNAddTwoStates(133, 138); }
                   break;
-               case 143:
+               case 139:
                   if ((0x280000000000L & l) != 0L)
                      { jjCheckNAddStates(5, 7); }
                   break;
-               case 144:
+               case 140:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 72)
+                     kind = 72;
                   { jjCheckNAddStates(0, 4); }
                   break;
-               case 145:
+               case 141:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
-                  { jjCheckNAdd(145); }
+                  if (kind > 72)
+                     kind = 72;
+                  { jjCheckNAdd(141); }
                   break;
-               case 146:
+               case 142:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
-                  { jjCheckNAddTwoStates(146, 137); }
+                  if (kind > 73)
+                     kind = 73;
+                  { jjCheckNAddTwoStates(142, 133); }
                   break;
-               case 204:
-                  if (curChar == 50 && kind > 52)
-                     kind = 52;
+               case 200:
+                  if (curChar == 50 && kind > 53)
+                     kind = 53;
                   break;
                default : break;
             }
@@ -1194,14 +1202,14 @@ else if (curChar < 128)
                case 5:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 71)
-                        kind = 71;
+                     if (kind > 72)
+                        kind = 72;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0xf800000150000001L & l) != 0L)
                   {
-                     if (kind > 73)
-                        kind = 73;
+                     if (kind > 74)
+                        kind = 74;
                      { jjCheckNAddTwoStates(18, 19); }
                   }
                   if ((0x40000000400000L & l) != 0L)
@@ -1210,26 +1218,26 @@ else if ((0x100000001000L & l) != 0L)
                      { jjCheckNAddStates(59, 65); }
                   else if ((0x400000004000L & l) != 0L)
                      { jjCheckNAddStates(66, 71); }
-                  else if ((0x200000002L & l) != 0L)
-                     { jjAddStates(72, 74); }
                   else if ((0x800000008000L & l) != 0L)
-                     { jjAddStates(75, 76); }
+                     { jjAddStates(72, 73); }
+                  else if ((0x200000002L & l) != 0L)
+                     { jjAddStates(74, 75); }
                   else if ((0x8000000080L & l) != 0L)
-                     { jjCheckNAddStates(77, 80); }
+                     { jjCheckNAddStates(76, 79); }
                   else if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(81, 82); }
+                     { jjAddStates(80, 81); }
                   else if ((0x400000004L & l) != 0L)
-                     { jjAddStates(83, 84); }
+                     { jjAddStates(82, 83); }
                   else if ((0x1000000010L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 4;
                   else if (curChar == 96)
-                     { jjCheckNAddStates(85, 88); }
+                     { jjCheckNAddStates(84, 87); }
                   else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 9;
                   break;
                case 0:
-                  if ((0x8000000080L & l) != 0L && kind > 37)
-                     kind = 37;
+                  if ((0x8000000080L & l) != 0L && kind > 38)
+                     kind = 38;
                   break;
                case 1:
                   if ((0x400000004000L & l) != 0L)
@@ -1248,8 +1256,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 3;
                   break;
                case 9:
-                  if (curChar == 124 && kind > 41)
-                     kind = 41;
+                  if (curChar == 124 && kind > 42)
+                     kind = 42;
                   break;
                case 10:
                   if (curChar == 124)
@@ -1258,28 +1266,28 @@ else if (curChar == 124)
                case 18:
                   if ((0xf800000150000001L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 19:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 20:
                   if ((0x400000004L & l) != 0L)
-                     { jjAddStates(83, 84); }
+                     { jjAddStates(82, 83); }
                   break;
                case 21:
-                  if ((0x80000000800000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x80000000800000L & l) != 0L && kind > 44)
+                     kind = 44;
                   break;
                case 22:
-                  if ((0x400000004000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x400000004000L & l) != 0L && kind > 44)
+                     kind = 44;
                   break;
                case 23:
                   if ((0x2000000020L & l) != 0L)
@@ -1303,16 +1311,16 @@ else if (curChar == 124)
                   break;
                case 28:
                   if ((0x2000000020L & l) != 0L)
-                     { jjAddStates(81, 82); }
+                     { jjAddStates(80, 81); }
                   break;
                case 29:
-                  if ((0x8000000080000L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x8000000080000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 30:
                case 48:
-               case 148:
-               case 186:
+               case 144:
+               case 182:
                   if ((0x100000001000L & l) != 0L)
                      { jjCheckNAdd(29); }
                   break;
@@ -1329,19 +1337,19 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 32;
                   break;
                case 34:
-                  if ((0x2000000020000L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x2000000020000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 35:
                   if ((0x8000000080L & l) != 0L)
-                     { jjCheckNAddStates(77, 80); }
+                     { jjCheckNAddStates(76, 79); }
                   break;
                case 36:
-                  if ((0x400000004000L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x400000004000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 37:
-               case 179:
+               case 175:
                   if ((0x200000002L & l) != 0L)
                      { jjCheckNAdd(36); }
                   break;
@@ -1382,8 +1390,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 45;
                   break;
                case 47:
-                  if ((0x10000000100000L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x10000000100000L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 49:
                   if ((0x200000002L & l) != 0L)
@@ -1462,244 +1470,244 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 66;
                   break;
                case 68:
-                  if ((0x2000000020L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x2000000020L & l) != 0L && kind > 43)
+                     kind = 43;
                   break;
                case 69:
-               case 203:
+               case 199:
                   if ((0x10000000100000L & l) != 0L)
                      { jjCheckNAdd(68); }
                   break;
                case 70:
-                  if ((0x800000008000L & l) != 0L)
-                     { jjAddStates(75, 76); }
+                  if ((0x200000002L & l) != 0L)
+                     { jjAddStates(74, 75); }
                   break;
                case 71:
-                  if ((0x400000004000L & l) != 0L && kind > 37)
-                     kind = 37;
+                  if ((0x10000000100000L & l) != 0L && kind > 38)
+                     kind = 38;
                   break;
                case 72:
-                  if ((0x4000000040000L & l) != 0L && kind > 41)
+                  if ((0x1000000010L & l) != 0L && kind > 41)
                      kind = 41;
                   break;
                case 73:
-                  if ((0x200000002L & l) != 0L)
-                     { jjAddStates(72, 74); }
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 72;
                   break;
                case 74:
-                  if ((0x10000000100000L & l) != 0L && kind > 37)
-                     kind = 37;
+                  if ((0x800000008000L & l) != 0L)
+                     { jjAddStates(72, 73); }
                   break;
                case 75:
-                  if ((0x4000000040L & l) != 0L && kind > 37)
-                     kind = 37;
+                  if ((0x400000004000L & l) != 0L && kind > 38)
+                     kind = 38;
                   break;
                case 76:
-                  if ((0x800000008000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 75;
-                  break;
-               case 78:
-                  if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 77;
-                  break;
-               case 79:
-                  if ((0x1000000010L & l) != 0L && kind > 40)
-                     kind = 40;
+                  if ((0x4000000040000L & l) != 0L && kind > 42)
+                     kind = 42;
                   break;
                case 80:
-                  if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 79;
-                  break;
-               case 84:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 85;
+                     jjstateSet[jjnewStateCnt++] = 81;
                   break;
-               case 85:
+               case 81:
                   { jjCheckNAddStates(22, 24); }
                   break;
-               case 86:
+               case 82:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(22, 24); }
                   break;
-               case 88:
+               case 84:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 89;
+                     jjstateSet[jjnewStateCnt++] = 85;
                   break;
-               case 89:
+               case 85:
                   { jjCheckNAddStates(25, 27); }
                   break;
-               case 90:
+               case 86:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(25, 27); }
                   break;
-               case 93:
+               case 89:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 94;
+                     jjstateSet[jjnewStateCnt++] = 90;
                   break;
-               case 94:
+               case 90:
                   { jjCheckNAddStates(28, 30); }
                   break;
-               case 95:
+               case 91:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(28, 30); }
                   break;
-               case 97:
+               case 93:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 98;
+                     jjstateSet[jjnewStateCnt++] = 94;
                   break;
-               case 98:
+               case 94:
                   { jjCheckNAddStates(31, 33); }
                   break;
-               case 99:
+               case 95:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(31, 33); }
                   break;
-               case 101:
+               case 97:
                   if (curChar == 96)
-                     { jjCheckNAddStates(85, 88); }
+                     { jjCheckNAddStates(84, 87); }
                   break;
-               case 102:
+               case 98:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 103;
+                     jjstateSet[jjnewStateCnt++] = 99;
                   break;
-               case 103:
+               case 99:
                   { jjCheckNAddStates(34, 36); }
                   break;
-               case 104:
+               case 100:
                   if ((0xfffffffeefffffffL & l) != 0L)
                      { jjCheckNAddStates(34, 36); }
                   break;
-               case 105:
-                  if (curChar == 96 && kind > 64)
-                     kind = 64;
+               case 101:
+                  if (curChar == 96 && kind > 65)
+                     kind = 65;
                   break;
-               case 106:
+               case 102:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 107;
+                     jjstateSet[jjnewStateCnt++] = 103;
                   break;
-               case 107:
+               case 103:
                   { jjCheckNAddStates(37, 39); }
                   break;
-               case 108:
+               case 104:
                   if ((0xfffffffeefffffffL & l) != 0L)
                      { jjCheckNAddStates(37, 39); }
                   break;
-               case 109:
-                  if (curChar == 96 && kind > 66)
-                     kind = 66;
+               case 105:
+                  if (curChar == 96 && kind > 67)
+                     kind = 67;
                   break;
-               case 111:
+               case 107:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 112;
+                     jjstateSet[jjnewStateCnt++] = 108;
                   break;
-               case 112:
+               case 108:
                   { jjCheckNAddStates(40, 42); }
                   break;
-               case 113:
+               case 109:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(40, 42); }
                   break;
-               case 115:
+               case 111:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 116;
+                     jjstateSet[jjnewStateCnt++] = 112;
                   break;
-               case 116:
+               case 112:
                   { jjCheckNAddStates(43, 45); }
                   break;
-               case 117:
+               case 113:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(43, 45); }
                   break;
-               case 120:
+               case 116:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 121;
+                     jjstateSet[jjnewStateCnt++] = 117;
                   break;
-               case 121:
+               case 117:
                   { jjCheckNAddStates(46, 48); }
                   break;
-               case 122:
+               case 118:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(46, 48); }
                   break;
-               case 124:
+               case 120:
                   if (curChar == 92)
-                     jjstateSet[jjnewStateCnt++] = 125;
+                     jjstateSet[jjnewStateCnt++] = 121;
                   break;
-               case 125:
+               case 121:
                   { jjCheckNAddStates(49, 51); }
                   break;
-               case 126:
+               case 122:
                   if ((0xffffffffefffffffL & l) != 0L)
                      { jjCheckNAddStates(49, 51); }
                   break;
-               case 142:
+               case 138:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
-                  { jjCheckNAddTwoStates(137, 142); }
+                  if (kind > 73)
+                     kind = 73;
+                  { jjCheckNAddTwoStates(133, 138); }
                   break;
-               case 144:
+               case 140:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 72)
+                     kind = 72;
                   { jjCheckNAddStates(0, 4); }
                   break;
-               case 145:
+               case 141:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
-                  { jjCheckNAdd(145); }
+                  if (kind > 72)
+                     kind = 72;
+                  { jjCheckNAdd(141); }
                   break;
-               case 146:
+               case 142:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
-                  { jjCheckNAddTwoStates(146, 137); }
+                  if (kind > 73)
+                     kind = 73;
+                  { jjCheckNAddTwoStates(142, 133); }
                   break;
-               case 147:
+               case 143:
                   if ((0x400000004000L & l) != 0L)
                      { jjCheckNAddStates(66, 71); }
                   break;
-               case 149:
+               case 145:
                   if ((0x200000002L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 144;
+                  break;
+               case 146:
+                  if ((0x20000000200000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 145;
+                  break;
+               case 147:
+                  if ((0x2000000020000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 146;
+                  break;
+               case 148:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 147;
+                  break;
+               case 149:
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 148;
                   break;
                case 150:
-                  if ((0x20000000200000L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 149;
                   break;
                case 151:
-                  if ((0x2000000020000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 150;
                   break;
                case 152:
-                  if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 151;
+                  if ((0x100000001000000L & l) != 0L && kind > 55)
+                     kind = 55;
                   break;
                case 153:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 152;
+               case 157:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjCheckNAdd(152); }
                   break;
                case 154:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x8000000080L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 153;
                   break;
                case 155:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 154;
                   break;
                case 156:
-                  if ((0x100000001000000L & l) != 0L && kind > 54)
-                     kind = 54;
-                  break;
-               case 157:
-               case 161:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAdd(156); }
+                  if ((0x4000000040000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 155;
                   break;
                case 158:
                   if ((0x8000000080L & l) != 0L)
@@ -1713,266 +1721,270 @@ else if (curChar == 124)
                   if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 159;
                   break;
+               case 161:
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 160;
+                  break;
                case 162:
-                  if ((0x8000000080L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 161;
                   break;
                case 163:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 162;
                   break;
                case 164:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 163;
+                  if ((0x2000000020L & l) != 0L && kind > 57)
+                     kind = 57;
                   break;
                case 165:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 164;
+               case 168:
+                  if ((0x80000000800L & l) != 0L)
+                     { jjCheckNAdd(164); }
                   break;
                case 166:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 165;
                   break;
                case 167:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x100000001000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 166;
                   break;
-               case 168:
-                  if ((0x2000000020L & l) != 0L && kind > 56)
-                     kind = 56;
-                  break;
                case 169:
-               case 172:
-                  if ((0x80000000800L & l) != 0L)
-                     { jjCheckNAdd(168); }
+                  if ((0x20000000200L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 168;
                   break;
                case 170:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x100000001000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 169;
                   break;
                case 171:
-                  if ((0x100000001000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 170;
                   break;
+               case 172:
+                  if ((0x10000000100000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 171;
+                  break;
                case 173:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 172;
                   break;
                case 174:
                   if ((0x100000001000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 173;
-                  break;
-               case 175:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 174;
+                     { jjCheckNAddStates(59, 65); }
                   break;
                case 176:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x10000000100L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 175;
                   break;
                case 177:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 176;
                   break;
                case 178:
-                  if ((0x100000001000L & l) != 0L)
-                     { jjCheckNAddStates(59, 65); }
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 177;
+                  break;
+               case 179:
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 178;
                   break;
                case 180:
-                  if ((0x10000000100L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 179;
                   break;
                case 181:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 180;
                   break;
-               case 182:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 181;
-                  break;
                case 183:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 182;
                   break;
                case 184:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x20000000200000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 183;
                   break;
                case 185:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x2000000020000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 184;
                   break;
+               case 186:
+                  if ((0x2000000020L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 185;
+                  break;
                case 187:
-                  if ((0x200000002L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 186;
                   break;
                case 188:
-                  if ((0x20000000200000L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 187;
                   break;
                case 189:
-                  if ((0x2000000020000L & l) != 0L)
+                  if ((0x800000008000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 188;
                   break;
                case 190:
-                  if ((0x2000000020L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 189;
                   break;
                case 191:
-                  if (curChar == 95)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 190;
                   break;
                case 192:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 191;
                   break;
                case 193:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x10000000100L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 192;
                   break;
                case 194:
-                  if (curChar == 95)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 193;
                   break;
                case 195:
-                  if ((0x400000004000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 194;
                   break;
                case 196:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 195;
                   break;
                case 197:
-                  if ((0x10000000100L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 196;
                   break;
                case 198:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 197;
                   break;
-               case 199:
-                  if (curChar == 95)
-                     jjstateSet[jjnewStateCnt++] = 198;
-                  break;
-               case 200:
-                  if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 199;
-                  break;
                case 201:
                   if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 200;
+                     { jjCheckNAdd(200); }
                   break;
                case 202:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x80000000800L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 201;
                   break;
+               case 203:
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 202;
+                  break;
+               case 204:
+                  if ((0x80000000800L & l) != 0L)
+                     { jjCheckNAdd(200); }
+                  break;
                case 205:
-                  if ((0x8000000080000L & l) != 0L)
-                     { jjCheckNAdd(204); }
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 204;
                   break;
                case 206:
-                  if ((0x80000000800L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 205;
+                  if ((0x800000008000L & l) != 0L && kind > 53)
+                     kind = 53;
                   break;
                case 207:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x10000000100000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 206;
                   break;
                case 208:
-                  if ((0x80000000800L & l) != 0L)
-                     { jjCheckNAdd(204); }
+                  if (curChar == 95)
+                     jjstateSet[jjnewStateCnt++] = 207;
                   break;
                case 209:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 208;
                   break;
                case 210:
-                  if ((0x800000008000L & l) != 0L && kind > 52)
-                     kind = 52;
+                  if ((0x80000000800L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 209;
                   break;
                case 211:
-                  if ((0x10000000100000L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 210;
                   break;
                case 212:
-                  if (curChar == 95)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 211;
                   break;
                case 213:
-                  if ((0x8000000080000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 212;
+                  if ((0x40000000400000L & l) != 0L)
+                     { jjAddStates(55, 58); }
                   break;
                case 214:
-                  if ((0x80000000800L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 213;
+                  if ((0x1000000010000L & l) != 0L && kind > 7)
+                     kind = 7;
                   break;
                case 215:
-                  if ((0x400000004000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 214;
+               case 226:
+                  if ((0x200000002L & l) != 0L)
+                     { jjCheckNAdd(214); }
                   break;
                case 216:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x80000000800000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 215;
                   break;
                case 217:
-                  if ((0x40000000400000L & l) != 0L)
-                     { jjAddStates(55, 58); }
+                  if ((0x8000000080000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 216;
                   break;
                case 218:
-                  if ((0x1000000010000L & l) != 0L && kind > 7)
-                     kind = 7;
+                  if ((0x1000000010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 217;
                   break;
                case 219:
-               case 230:
-                  if ((0x200000002L & l) != 0L)
-                     { jjCheckNAdd(218); }
+                  if ((0x400000004000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 218;
                   break;
                case 220:
-                  if ((0x80000000800000L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 219;
                   break;
                case 221:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 220;
                   break;
                case 222:
-                  if ((0x1000000010L & l) != 0L)
+                  if ((0x4000000040L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 221;
                   break;
                case 223:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 222;
                   break;
                case 224:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 223;
                   break;
                case 225:
-                  if ((0x200000002000000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 224;
                   break;
-               case 226:
-                  if ((0x4000000040L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 225;
-                  break;
                case 227:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x80000000800000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 226;
                   break;
                case 228:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 227;
                   break;
                case 229:
-                  if ((0x2000000020L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 228;
                   break;
+               case 230:
+                  if ((0x1000000010L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 229;
+                  break;
                case 231:
-                  if ((0x80000000800000L & l) != 0L)
+                  if ((0x400000004000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 230;
                   break;
                case 232:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x200000002L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 231;
                   break;
                case 233:
@@ -1980,121 +1992,105 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 232;
                   break;
                case 234:
-                  if ((0x1000000010L & l) != 0L)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 233;
                   break;
                case 235:
-                  if ((0x400000004000L & l) != 0L)
+                  if ((0x4000000040L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 234;
                   break;
                case 236:
-                  if ((0x200000002L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 235;
                   break;
                case 237:
-                  if (curChar == 95)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 236;
                   break;
                case 238:
-                  if ((0x200000002000000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 237;
                   break;
                case 239:
-                  if ((0x4000000040L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 238;
+                  if ((0x10000000100000L & l) != 0L && kind > 8)
+                     kind = 8;
                   break;
                case 240:
-                  if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 239;
+               case 249:
+                  if ((0x2000000020L & l) != 0L)
+                     { jjCheckNAdd(239); }
                   break;
                case 241:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 240;
                   break;
                case 242:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 241;
                   break;
                case 243:
-                  if ((0x10000000100000L & l) != 0L && kind > 8)
-                     kind = 8;
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 242;
                   break;
                case 244:
-               case 253:
-                  if ((0x2000000020L & l) != 0L)
-                     { jjCheckNAdd(243); }
+                  if ((0x200000002000000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 243;
                   break;
                case 245:
-                  if ((0x8000000080000L & l) != 0L)
+                  if ((0x4000000040L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 244;
                   break;
                case 246:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 245;
                   break;
                case 247:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 246;
                   break;
                case 248:
-                  if ((0x200000002000000L & l) != 0L)
+                  if ((0x2000000020L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 247;
                   break;
-               case 249:
-                  if ((0x4000000040L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 248;
-                  break;
                case 250:
-                  if ((0x20000000200L & l) != 0L)
+                  if ((0x8000000080000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 249;
                   break;
                case 251:
-                  if ((0x4000000040000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 250;
                   break;
                case 252:
-                  if ((0x2000000020L & l) != 0L)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 251;
                   break;
+               case 253:
+                  if ((0x800000008000L & l) != 0L)
+                     jjstateSet[jjnewStateCnt++] = 252;
+                  break;
                case 254:
-                  if ((0x8000000080000L & l) != 0L)
+                  if (curChar == 95)
                      jjstateSet[jjnewStateCnt++] = 253;
                   break;
                case 255:
-                  if (curChar == 95)
+                  if ((0x200000002000000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 254;
                   break;
                case 256:
-                  if ((0x4000000040000L & l) != 0L)
+                  if ((0x4000000040L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 255;
                   break;
                case 257:
-                  if ((0x800000008000L & l) != 0L)
+                  if ((0x20000000200L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 256;
                   break;
                case 258:
-                  if (curChar == 95)
+                  if ((0x4000000040000L & l) != 0L)
                      jjstateSet[jjnewStateCnt++] = 257;
                   break;
                case 259:
-                  if ((0x200000002000000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 258;
-                  break;
-               case 260:
-                  if ((0x4000000040L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 259;
-                  break;
-               case 261:
-                  if ((0x20000000200L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 260;
-                  break;
-               case 262:
-                  if ((0x4000000040000L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 261;
-                  break;
-               case 263:
                   if ((0x2000000020L & l) != 0L)
-                     jjstateSet[jjnewStateCnt++] = 262;
+                     jjstateSet[jjnewStateCnt++] = 258;
                   break;
                default : break;
             }
@@ -2114,105 +2110,105 @@ else if (curChar == 124)
                case 5:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                   {
-                     if (kind > 73)
-                        kind = 73;
+                     if (kind > 74)
+                        kind = 74;
                      { jjCheckNAddTwoStates(18, 19); }
                   }
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(89, 92); }
+                     { jjCheckNAddStates(88, 91); }
                   if (jjCanMove_4(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(93, 96); }
+                     { jjCheckNAddStates(92, 95); }
                   break;
                case 18:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 74)
+                     kind = 74;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
-               case 83:
+               case 79:
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(89, 92); }
+                     { jjCheckNAddStates(88, 91); }
                   break;
-               case 85:
+               case 81:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(22, 24); }
                   break;
-               case 86:
+               case 82:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(22, 24); }
                   break;
-               case 87:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 64)
-                     kind = 64;
+               case 83:
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 65)
+                     kind = 65;
                   break;
-               case 89:
+               case 85:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(25, 27); }
                   break;
-               case 90:
+               case 86:
                   if (jjCanMove_2(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(25, 27); }
                   break;
+               case 87:
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 66)
+                     kind = 66;
+                  break;
+               case 90:
                case 91:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 65)
-                     kind = 65;
+                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                     { jjCheckNAddStates(28, 30); }
                   break;
                case 94:
                case 95:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(28, 30); }
+                     { jjCheckNAddStates(31, 33); }
                   break;
-               case 98:
                case 99:
+               case 100:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(31, 33); }
+                     { jjCheckNAddStates(34, 36); }
                   break;
                case 103:
                case 104:
-                  if (jjCanMove_0(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(34, 36); }
-                  break;
-               case 107:
-               case 108:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(37, 39); }
                   break;
-               case 110:
+               case 106:
                   if (jjCanMove_4(hiByte, i1, i2, l1, l2))
-                     { jjCheckNAddStates(93, 96); }
+                     { jjCheckNAddStates(92, 95); }
                   break;
-               case 112:
+               case 108:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(40, 42); }
                   break;
-               case 113:
+               case 109:
                   if (jjCanMove_5(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(40, 42); }
                   break;
-               case 114:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 64)
-                     kind = 64;
+               case 110:
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 65)
+                     kind = 65;
                   break;
-               case 116:
+               case 112:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(43, 45); }
                   break;
-               case 117:
+               case 113:
                   if (jjCanMove_5(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(43, 45); }
                   break;
-               case 118:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 66)
-                     kind = 66;
+               case 114:
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 67)
+                     kind = 67;
                   break;
-               case 121:
-               case 122:
+               case 117:
+               case 118:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(46, 48); }
                   break;
-               case 125:
-               case 126:
+               case 121:
+               case 122:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                      { jjCheckNAddStates(49, 51); }
                   break;
@@ -2227,7 +2223,7 @@ else if (curChar == 124)
          kind = 0x7fffffff;
       }
       ++curPos;
-      if ((i = jjnewStateCnt) == (startsAt = 264 - (jjnewStateCnt = startsAt)))
+      if ((i = jjnewStateCnt) == (startsAt = 260 - (jjnewStateCnt = startsAt)))
          break;
       try { curChar = input_stream.readChar(); }
       catch(java.io.IOException e) { break; }
@@ -2257,11 +2253,11 @@ else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
 public static final String[] jjstrLiteralImages = {
 "", null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, "\173", "\175", "\72", "\50", "\51", "\133", "\135", null, null, 
-null, null, null, null, null, "\74", "\76", null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, "\174", null, null, null, 
-null, "\54", null, null, null, null, null, null, null, null, null, "\12", "\137", 
-"\75", };
+null, null, null, null, "\173", "\175", "\72", "\50", "\51", "\133", "\135", null, 
+null, null, null, null, null, null, "\74", "\76", null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, null, null, null, "\174", null, null, 
+null, null, "\54", null, null, null, null, null, null, null, null, null, "\12", 
+"\137", "\75", };
 protected Token jjFillToken()
 {
    final Token t;
@@ -2286,13 +2282,12 @@ protected Token jjFillToken()
    return t;
 }
 static final int[] jjnextStates = {
-   145, 146, 137, 18, 19, 130, 131, 134, 120, 122, 124, 126, 93, 95, 97, 99, 
-   129, 130, 131, 132, 134, 135, 84, 86, 87, 88, 90, 91, 93, 95, 96, 97, 
-   99, 100, 102, 104, 105, 106, 108, 109, 111, 113, 114, 115, 117, 118, 120, 122, 
-   123, 124, 126, 127, 138, 139, 142, 229, 242, 252, 263, 185, 47, 202, 203, 207, 
-   209, 216, 155, 68, 160, 167, 171, 177, 74, 78, 80, 71, 72, 46, 47, 67, 
-   69, 33, 34, 21, 27, 102, 104, 106, 108, 84, 86, 88, 90, 111, 113, 115, 
-   117, 
+   141, 142, 133, 18, 19, 126, 127, 130, 116, 118, 120, 122, 89, 91, 93, 95, 
+   125, 126, 127, 128, 130, 131, 80, 82, 83, 84, 86, 87, 89, 91, 92, 93, 
+   95, 96, 98, 100, 101, 102, 104, 105, 107, 109, 110, 111, 113, 114, 116, 118, 
+   119, 120, 122, 123, 134, 135, 138, 225, 238, 248, 259, 181, 47, 198, 199, 203, 
+   205, 212, 151, 68, 156, 163, 167, 173, 75, 76, 71, 73, 46, 47, 67, 69, 
+   33, 34, 21, 27, 98, 100, 102, 104, 80, 82, 84, 86, 107, 109, 111, 113, 
 };
 private static final boolean jjCanMove_0(int hiByte, int i1, int i2, long l1, long l2)
 {
@@ -2528,7 +2523,7 @@ private void ReInitRounds()
   {
     int i;
     jjround = 0x80000001;
-    for (i = 264; i-- > 0;)
+    for (i = 260; i-- > 0;)
       jjrounds[i] = 0x80000000;
   }
 
@@ -2560,10 +2555,10 @@ public void SwitchTo(int lexState)
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfdf03ffffffffff9L, 0x1c3ffL, 
+   0xfbe07ffffffffff9L, 0x387ffL, 
 };
 static final long[] jjtoSkip = {
    0x6L, 0x0L, 
@@ -2576,8 +2571,8 @@ public void SwitchTo(int lexState)
 };
     protected SimpleCharStream  input_stream;
 
-    private final int[] jjrounds = new int[264];
-    private final int[] jjstateSet = new int[2 * 264];
+    private final int[] jjrounds = new int[260];
+    private final int[] jjstateSet = new int[2 * 260];
     private final StringBuilder jjimage = new StringBuilder();
     private StringBuilder image = jjimage;
     private int jjimageLen;
diff --git a/src/test/java/com/cinchapi/ccl/GrammarTest.java b/src/test/java/com/cinchapi/ccl/GrammarTest.java
index e6be44fc..2d65008f 100644
--- a/src/test/java/com/cinchapi/ccl/GrammarTest.java
+++ b/src/test/java/com/cinchapi/ccl/GrammarTest.java
@@ -577,6 +577,16 @@ public void testKeyWithStringTimestampAscending() throws UnsupportedEncodingExce
         grammar.generateAST();
     }
 
+    @Test(expected = ParseException.class)
+    public void testKeyWithStringTimestampAscendingException() throws UnsupportedEncodingException, ParseException {
+        String input = ORDER + " < age as of \"1992-10-02\"";
+
+        InputStream stream = new ByteArrayInputStream(input.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
     @Test
     public void testKeyWithNumberTimestampDescending() throws UnsupportedEncodingException, ParseException {
         String input = ORDER + " > age at " + String.valueOf(122L);

From a82499953aacb698e78fcd6dc7a4e8dc4523cf0c Mon Sep 17 00:00:00 2001
From: Javier Lores <lores.javier@gmail.com>
Date: Fri, 7 Feb 2025 17:01:18 -0600
Subject: [PATCH 8/9] updated grammar to match Concourse.java

---
 grammar/grammar.jjt                           |  669 ++--
 .../com/cinchapi/ccl/generated/Grammar.java   | 3506 ++++++++++-------
 .../ccl/generated/GrammarConstants.java       |  161 +-
 .../ccl/generated/GrammarTokenManager.java    | 1057 +++--
 .../ccl/grammar/command/AddSymbol.java        |   52 +-
 .../ccl/grammar/command/AuditSymbol.java      |   53 -
 .../ccl/grammar/command/BrowseSymbol.java     |   67 +
 .../grammar/command/ChronologizeSymbol.java   |  104 +
 .../ccl/grammar/command/DescribeSymbol.java   |    2 +-
 .../ccl/grammar/command/DiffSymbol.java       |  104 +
 .../ccl/grammar/command/FetchSymbol.java      |  108 -
 .../ccl/grammar/command/FindSymbol.java       |   69 +-
 .../ccl/grammar/command/GetSymbol.java        |   49 +-
 .../ccl/grammar/command/InventorySymbol.java  |   31 +
 .../ccl/grammar/command/JsonifySymbol.java    |  104 +
 .../ccl/grammar/command/NavigateSymbol.java   |  151 +
 .../ccl/grammar/command/ReconcileSymbol.java  |   69 +
 .../ccl/grammar/command/RemoveSymbol.java     |   51 +-
 .../ccl/grammar/command/ReviewSymbol.java     |  115 +
 .../ccl/grammar/command/SelectSymbol.java     |   70 +-
 .../ccl/grammar/command/TraceSymbol.java      |  116 +
 .../com/cinchapi/ccl/syntax/CommandTree.java  |    1 -
 .../java/com/cinchapi/ccl/syntax/Visitor.java |    5 +-
 .../cinchapi/ccl/CompilerJavaCCLogicTest.java |  374 +-
 .../java/com/cinchapi/ccl/GrammarTest.java    |  880 ++++-
 25 files changed, 5222 insertions(+), 2746 deletions(-)
 delete mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/BrowseSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/ChronologizeSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/DiffSymbol.java
 delete mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/InventorySymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/JsonifySymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/NavigateSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/ReconcileSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/ReviewSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/TraceSymbol.java

diff --git a/grammar/grammar.jjt b/grammar/grammar.jjt
index 409a2a3e..9c2db43a 100644
--- a/grammar/grammar.jjt
+++ b/grammar/grammar.jjt
@@ -45,6 +45,7 @@ import com.cinchapi.ccl.grammar.TimestampSymbol;
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.PageSymbol;
 import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 import com.cinchapi.ccl.syntax.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
@@ -100,6 +101,17 @@ public class Grammar {
     public Object transformValue(String token) {
         return valueTransformFunction.apply(token);
     }
+
+    private boolean isValidJson(String json) {
+        // Basic JSON validation
+        int braceCount = 0;
+        for(char c : json.toCharArray()) {
+            if(c == '{') braceCount++;
+            if(c == '}') braceCount--;
+            if(braceCount < 0) return false;
+        }
+        return braceCount == 0;
+    }
 }
 
 PARSER_END(Grammar)
@@ -112,8 +124,8 @@ SKIP :
   "\t"
 }
 
-TOKEN [IGNORE_CASE]:
-{
+// Token definitions
+TOKEN [IGNORE_CASE] : {
   // Data modification commands
   < ADD: "add" >
 | < SET: "set" >
@@ -131,20 +143,31 @@ TOKEN [IGNORE_CASE]:
 
   // Query operations
 | < SELECT: "select" >
-| < FETCH: "fetch" >
 | < GET: "get" >
+| < FIND: "find" >
 | < DESCRIBE: "describe" >
-| < AUDIT: "audit" >
 | < VERIFY: "verify" >
 | < SEARCH: "search" >
+| < BROWSE: "browse" >
+| < CHRONOLOGIZE: "chronologize" >
+| < DIFF: "diff" >
+| < INVENTORY: "inventory" >
+| < JSONIFY: "jsonify" >
+| < NAVIGATE: "navigate" >
+| < RECONCILE: "reconcile" >
+| < REVIEW: "review" >
+| < TRACE: "trace" >
+| < CALCULATE: "calculate" >
 
   // Transaction operations
 | < STAGE: "stage" >
 | < COMMIT: "commit" >
 | < ABORT: "abort" >
 
-  // Other tokens needed for command syntax
+  // Revert operation
 | < REVERT: "revert" >
+
+  // Other keywords
 | < IN: "in" >
 | < INTO: "into" >
 | < FROM: "from" >
@@ -322,13 +345,13 @@ void RelationalExpression() #Expression :
 {
     key=Key()
       (
-        operator=LinksToOperator() value1=LinksToValue() (timestamp=Timestamp())?
+        operator=LinksToOperator() value1=LinksToValue() (LOOKAHEAD(2) timestamp=Timestamp())?
       |
-        operator=RegexBasedOperator() value1=RegexValue() (timestamp=Timestamp())?
+        operator=RegexBasedOperator() value1=RegexValue() (LOOKAHEAD(2) timestamp=Timestamp())?
       |
-        operator=UnaryOperator() value1=UnaryValue() (timestamp=Timestamp())?
+        operator=UnaryOperator() value1=UnaryValue() (LOOKAHEAD(2) timestamp=Timestamp())?
       |
-        operator=BinaryOperator() value1=BinaryValue() value2=BinaryValue() (timestamp=Timestamp())?
+        operator=BinaryOperator() value1=BinaryValue() value2=BinaryValue() (LOOKAHEAD(2) timestamp=Timestamp())?
       ) { jjtThis.key(key);
           jjtThis.operator(operator);
           jjtThis.addValue(value1);
@@ -538,7 +561,7 @@ TimestampSymbol Timestamp() :
   { return new TimestampSymbol(NaturalLanguage.parseMicros(timestamp)); }
 }
 
-TimestampSymbol TimestampReadingCommand() :
+TimestampSymbol TimestampReadCommand() :
 {
   Token word;
   String timestamp = "";
@@ -740,112 +763,128 @@ FunctionValueSymbol ValueFunction() :
    )
 }
 
-void Command() : {}
+void Command() #Command : {
+    CommandSymbol cmd;
+}
 {
-      DataModificationOperations()
-    |
-      RecordOperations()
-    |
-      LinkOperations()
-    |
-      QueryOperations()
-    |
-      TransactionOperations()
-    |
-      RevertCommand()
+    (
+        cmd = DataModificationOperations()
+      |
+        cmd = RecordOperations()
+      |
+        cmd = LinkOperations()
+      |
+        cmd = QueryOperations()
+      |
+        cmd = TransactionOperations()
+      |
+        cmd = RevertCommand()
+    )
+    { jjtThis.command(cmd); }
 }
 
-void DataModificationOperations() : {}
+CommandSymbol DataModificationOperations() : {
+    CommandSymbol cmd;
+}
 {
-    AddCommand()
-  |
-    SetCommand()
-  |
-    RemoveCommand()
-  |
-    ClearCommand()
-  |
-    VerifyAndSwapCommand()
-  |
-    VerifyOrSetCommand()
+    (
+        cmd = AddCommand()
+      |
+        cmd = SetCommand()
+      |
+        cmd = RemoveCommand()
+      |
+        cmd = ClearCommand()
+      |
+        cmd = VerifyAndSwapCommand()
+      |
+        cmd = VerifyOrSetCommand()
+    )
+    { return cmd; }
 }
 
-void AddCommand() #Command :
-{
+CommandSymbol AddCommand() : {
     KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
-    Token record;
+    Token record = null;
+    Collection records = null;
 }
 {
-    <ADD> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
-    {
-        jjtThis.command(new AddSymbol(key, value, Long.parseLong(record.image)));
-    }
+    <ADD> key=Key() <AS> value=UnaryValue()
+    (
+        (<IN>
+        (
+            record=<NUMERIC>
+            { return new AddSymbol(key, value, Long.parseLong(record.image)); }
+          |
+            records=RecordCollection()
+            { return new AddSymbol(key, value, records); }
+        ))?
+    )
+    { return new AddSymbol(key, value); }
 }
 
-void SetCommand() #Command :
-{
+CommandSymbol SetCommand() : {
     KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
 }
 {
     <SET> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
-    {
-        jjtThis.command(new SetSymbol(key, value, Long.parseLong(record.image)));
-    }
+    { return new SetSymbol(key, value, Long.parseLong(record.image)); }
 }
 
-void RemoveCommand() #Command :
-{
+CommandSymbol RemoveCommand() : {
     KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value = null;
     Token record;
+    Collection records = null;
 }
 {
-    <REMOVE> key=Key() (<AS> value=UnaryValue())? (<FROM> | <IN>) record=<NUMERIC>
-    {
-        jjtThis.command(new RemoveSymbol(key, value, Long.parseLong(record.image)));
-    }
+    <REMOVE> key=Key() (<AS> value=UnaryValue())? (<FROM> | <IN>)
+    (
+        record=<NUMERIC> { return new RemoveSymbol(key, value, Long.parseLong(record.image)); }
+      |
+        records=RecordCollection() { return new RemoveSymbol(key, value, records); }
+    )
 }
 
-void ClearCommand() #Command :
-{
+CommandSymbol ClearCommand() : {
     KeyTokenSymbol<?> key = null;
-    Token record;
     Collection<KeyTokenSymbol<?>> keys = null;
+    Token record = null;
     Collection records = null;
 }
 {
     <CLEAR>
     (
+        LOOKAHEAD(2)
+        record=<NUMERIC>
+        { return new ClearSymbol((KeyTokenSymbol<?>)null, Long.parseLong(record.image)); }
+      |
+        LOOKAHEAD(3)
+        records=RecordCollection()
+        { return new ClearSymbol((KeyTokenSymbol<?>)null, records); }
+      |
         LOOKAHEAD(3)
         key=Key() <FROM> record=<NUMERIC>
-        {
-            jjtThis.command(new ClearSymbol(key, Long.parseLong(record.image)));
-        }
+        { return new ClearSymbol(key, Long.parseLong(record.image)); }
       |
         LOOKAHEAD(3)
         key=Key() <FROM> records=RecordCollection()
-        {
-            jjtThis.command(new ClearSymbol(key, records));
-        }
+        { return new ClearSymbol(key, records); }
       |
-        LOOKAHEAD(3)
+        LOOKAHEAD(7)
         keys=KeyCollection() <FROM> record=<NUMERIC>
-        {
-            jjtThis.command(new ClearSymbol(keys, Long.parseLong(record.image)));
-        }
+        { return new ClearSymbol(keys, Long.parseLong(record.image)); }
       |
+        LOOKAHEAD(7)
         keys=KeyCollection() <FROM> records=RecordCollection()
-        {
-            jjtThis.command(new ClearSymbol(keys, records));
-        }
+        { return new ClearSymbol(keys, records); }
     )
 }
 
-void VerifyAndSwapCommand() #Command :
-{
+CommandSymbol VerifyAndSwapCommand() : {
     KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> expected;
     ValueTokenSymbol<?> replacement;
@@ -854,67 +893,66 @@ void VerifyAndSwapCommand() #Command :
 {
     <VERIFY_AND_SWAP> key=Key() <AS> expected=UnaryValue() <IN> record=<NUMERIC>
     <WITH> replacement=UnaryValue()
-    {
-        jjtThis.command(new VerifyAndSwapSymbol(key, expected, replacement, Long.parseLong(record.image)));
-    }
+    { return new VerifyAndSwapSymbol(key, expected, replacement, Long.parseLong(record.image)); }
 }
 
-void VerifyOrSetCommand() #Command :
-{
+CommandSymbol VerifyOrSetCommand() : {
     KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
 }
 {
     <VERIFY_OR_SET> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
-    {
-        jjtThis.command(new VerifyOrSetSymbol(key, value, Long.parseLong(record.image)));
-    }
+    { return new VerifyOrSetSymbol(key, value, Long.parseLong(record.image)); }
 }
 
-void RecordOperations() : {}
+CommandSymbol RecordOperations() : {
+    CommandSymbol cmd;
+}
 {
-    InsertCommand()
+    cmd = InsertCommand()
+    { return cmd; }
 }
 
-void InsertCommand() #Command :
-{
+CommandSymbol InsertCommand() : {
     String json;
     Token record = null;
     Collection records = null;
 }
 {
     <INSERT> json=JsonObject()
+    {
+        // Basic JSON validation
+        if(!isValidJson(json)) {
+            throw new ParseException("Malformed JSON");
+        }
+    }
     (
         (<IN> | <INTO>)
         (
             record=<NUMERIC>
-            {
-                jjtThis.command(new InsertSymbol(json, Long.parseLong(record.image)));
-            }
+            { return new InsertSymbol(json, Long.parseLong(record.image)); }
           |
             records=RecordCollection()
-            {
-                jjtThis.command(new InsertSymbol(json, records));
-            }
+            { return new InsertSymbol(json, records); }
         )
     )?
-    {
-        if(record == null && records == null) {
-            jjtThis.command(new InsertSymbol(json));
-        }
-    }
+    { return new InsertSymbol(json); }
 }
 
-void LinkOperations() : {}
+CommandSymbol LinkOperations() : {
+    CommandSymbol cmd;
+}
 {
-    LinkCommand()
-  |
-    UnlinkCommand()
+    (
+        cmd = LinkCommand()
+      |
+        cmd = UnlinkCommand()
+    )
+    { return cmd; }
 }
 
-void LinkCommand() #Command :
-{
+CommandSymbol LinkCommand() : {
     KeyTokenSymbol<?> key;
     Token source;
     Token destination;
@@ -927,18 +965,15 @@ void LinkCommand() #Command :
         {
             Collection dest = new ArrayList();
             dest.add(Long.parseLong(destination.image));
-            jjtThis.command(new LinkSymbol(key, Long.parseLong(source.image), dest));
+            return new LinkSymbol(key, Long.parseLong(source.image), dest);
         }
       |
         destinations=RecordCollection()
-        {
-            jjtThis.command(new LinkSymbol(key, Long.parseLong(source.image), destinations));
-        }
+        { return new LinkSymbol(key, Long.parseLong(source.image), destinations); }
     )
 }
 
-void UnlinkCommand() #Command :
-{
+CommandSymbol UnlinkCommand() : {
     KeyTokenSymbol<?> key;
     Token source;
     Token destination;
@@ -951,121 +986,138 @@ void UnlinkCommand() #Command :
         {
             Collection dest = new ArrayList();
             dest.add(Long.parseLong(destination.image));
-            jjtThis.command(new UnlinkSymbol(key, Long.parseLong(source.image), dest));
+            return new UnlinkSymbol(key, Long.parseLong(source.image), dest);
         }
       |
         destinations=RecordCollection()
-        {
-            jjtThis.command(new UnlinkSymbol(key, Long.parseLong(source.image), destinations));
-        }
+        { return new UnlinkSymbol(key, Long.parseLong(source.image), destinations); }
     )
 }
 
-void QueryOperations() : {}
-{
-    SelectCommand()
-  |
-    FetchCommand()
-  |
-    GetCommand()
-  |
-    DescribeCommand()
-  |
-    AuditCommand()
-  |
-    VerifyCommand()
-  |
-    SearchCommand()
-}
-
-void SelectCommand() #Command :
-{
-    KeyTokenSymbol<?> key;
-    Token record;
-    TimestampSymbol timestamp = null;
+CommandSymbol QueryOperations() : {
+    CommandSymbol cmd;
 }
 {
-    <SELECT> key=Key() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
-    {
-        jjtThis.command(new SelectSymbol(key, Long.parseLong(record.image), timestamp));
-    }
+    (
+        cmd = SelectCommand()
+      |
+        cmd = GetCommand()
+      |
+        cmd = FindCommand()
+      |
+        cmd = DescribeCommand()
+      |
+        cmd = VerifyCommand()
+      |
+        cmd = SearchCommand()
+      |
+        cmd = BrowseCommand()
+      |
+        cmd = ChronologizeCommand()
+      |
+        cmd = DiffCommand()
+      |
+        cmd = InventoryCommand()
+      |
+        cmd = JsonifyCommand()
+      |
+        cmd = NavigateCommand()
+      |
+        cmd = ReconcileCommand()
+      |
+        cmd = ReviewCommand()
+      |
+        cmd = TraceCommand()
+    )
+    { return cmd; }
 }
 
-void FetchCommand() #Command :
-{
-    KeyTokenSymbol<?> key;
+CommandSymbol SelectCommand() : {
     Collection<KeyTokenSymbol<?>> keys = null;
-    Token record;
-    Collection records = null;
+    KeyTokenSymbol<?> key = null;
+    Token record = null;
+    Collection<Long> records = null;
     TimestampSymbol timestamp = null;
 }
 {
-    <FETCH>
+    <SELECT>
     (
-        LOOKAHEAD(3)
-        key=Key() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
-        {
-            jjtThis.command(new FetchSymbol(key, Long.parseLong(record.image), timestamp));
-        }
+        LOOKAHEAD(2)
+        keys=KeyCollection()
       |
-        LOOKAHEAD(3)
-        key=Key() <FROM> records=RecordCollection() (timestamp=TimestampReadingCommand())?
+        key=Key() {
+            keys = new ArrayList<KeyTokenSymbol<?>>();
+            keys.add(key);
+        }
+    )
+    (
+        LOOKAHEAD(2)
+        <FROM> record=<NUMERIC> (timestamp=TimestampReadCommand())? (Order())? (Page())?
         {
-            jjtThis.command(new FetchSymbol(key, records, timestamp));
+            return new SelectSymbol(keys, Long.parseLong(record.image), timestamp);
         }
       |
-        LOOKAHEAD(3)
-        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
+        LOOKAHEAD(2)
+        <FROM> records=RecordCollection() (timestamp=TimestampReadCommand())? (Order())? (Page())?
         {
-            jjtThis.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
+            return new SelectSymbol(keys, records, timestamp);
         }
       |
-        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=TimestampReadingCommand())?
+        <WHERE> DisjunctionExpression() (timestamp=TimestampReadCommand())? (Order())? (Page())?
         {
-            jjtThis.command(new FetchSymbol(keys, records, timestamp));
+            return new SelectSymbol(keys, timestamp);
         }
     )
 }
 
-void GetCommand() #Command :
-{
-    KeyTokenSymbol<?> key;
+CommandSymbol GetCommand() : {
+    KeyTokenSymbol<?> key = null;
     Collection<KeyTokenSymbol<?>> keys = null;
-    Token record;
+    Token record = null;
     Collection records = null;
     TimestampSymbol timestamp = null;
 }
 {
     <GET>
     (
-        LOOKAHEAD(3)
-        key=Key() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
-        {
-            jjtThis.command(new GetSymbol(key, Long.parseLong(record.image), timestamp));
-        }
+        LOOKAHEAD(7)
+        keys=KeyCollection() <WHERE> (DisjunctionExpression())? (timestamp=TimestampReadCommand())? (Order())? (Page())?
+        { return new GetSymbol(keys, timestamp); }
       |
         LOOKAHEAD(3)
-        key=Key() <FROM> records=RecordCollection() (timestamp=TimestampReadingCommand())?
-        {
-            jjtThis.command(new GetSymbol(key, records, timestamp));
-        }
+        key=Key() <FROM> record=<NUMERIC> (timestamp=TimestampReadCommand())? (Order())? (Page())?
+        { return new GetSymbol(key, Long.parseLong(record.image), timestamp); }
       |
         LOOKAHEAD(3)
-        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=TimestampReadingCommand())?
-        {
-            jjtThis.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
-        }
+        key=Key() <FROM> records=RecordCollection() (timestamp=TimestampReadCommand())? (Order())? (Page())?
+        { return new GetSymbol(key, records, timestamp); }
       |
-        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=TimestampReadingCommand())?
-        {
-            jjtThis.command(new GetSymbol(keys, records, timestamp));
-        }
+        LOOKAHEAD(7)
+        keys=KeyCollection() <FROM> record=<NUMERIC> (timestamp=TimestampReadCommand())? (Order())? (Page())?
+        { return new GetSymbol(keys, Long.parseLong(record.image), timestamp); }
+      |
+        LOOKAHEAD(3)
+        keys=KeyCollection() <FROM> records=RecordCollection() (timestamp=TimestampReadCommand())? (Order())? (Page())?
+        { return new GetSymbol(keys, records, timestamp); }
     )
 }
 
-void DescribeCommand() #Command :
+CommandSymbol FindCommand() : {
+    TimestampSymbol timestamp = null;
+}
 {
-    Token record;
+    <FIND>
+    DisjunctionExpression()
+    (timestamp=TimestampReadCommand())?
+    (Order())?
+    (Page())?
+    {
+        return new FindSymbol(timestamp);
+    }
+}
+
+CommandSymbol DescribeCommand() : {
+    Token record = null;
     Collection records = null;
     TimestampSymbol timestamp = null;
 }
@@ -1073,100 +1125,221 @@ void DescribeCommand() #Command :
     <DESCRIBE>
     (
         LOOKAHEAD(2)
-        record=<NUMERIC> (timestamp=TimestampReadingCommand())?
-        {
-            jjtThis.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
-        }
+        record=<NUMERIC> (timestamp=TimestampReadCommand())?
+        { return new DescribeSymbol(Long.parseLong(record.image), timestamp); }
       |
-        records=RecordCollection() (timestamp=TimestampReadingCommand())?
-        {
-            jjtThis.command(new DescribeSymbol(records, timestamp));
-        }
+        records=RecordCollection() (timestamp=TimestampReadCommand())?
+        { return new DescribeSymbol(records, timestamp); }
+      |
+        { return new DescribeSymbol(-1, null); }
     )
 }
 
-void AuditCommand() #Command :
+CommandSymbol VerifyCommand() : {
+    KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
+    Token record;
+    TimestampSymbol timestamp = null;
+}
 {
-    KeyTokenSymbol<?> key = null;
+    <VERIFY> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
+    (timestamp=TimestampReadCommand())?
+    { return new VerifySymbol(key, value, Long.parseLong(record.image), timestamp); }
+}
+
+CommandSymbol SearchCommand() : {
+    KeyTokenSymbol<?> key;
+    Token query;
+}
+{
+    <SEARCH> key=Key() <FOR> query=<QUOTED_STRING>
+    { return new SearchSymbol(key, query.image); }
+}
+
+CommandSymbol BrowseCommand() : {
+    Collection<KeyTokenSymbol<?>> keys;
+    TimestampSymbol timestamp = null;
+}
+{
+    <BROWSE> keys=KeyCollection() (timestamp=TimestampReadCommand())?
+    { return new BrowseSymbol(keys, timestamp); }
+}
+
+CommandSymbol ChronologizeCommand() : {
+    KeyTokenSymbol<?> key;
     Token record;
+    TimestampSymbol start = null;
+    TimestampSymbol end = null;
 }
 {
-    <AUDIT>
+    <CHRONOLOGIZE> key=Key() <IN> record=<NUMERIC>
+    (
+        (start=TimestampReadCommand())
+        (end=TimestampReadCommand())?
+    )?
+    { return new ChronologizeSymbol(key, Long.parseLong(record.image), start, end); }
+}
+
+CommandSymbol DiffCommand() : {
+    KeyTokenSymbol<?> key = null;
+    Token record = null;
+    TimestampSymbol start;
+    TimestampSymbol end = null;
+}
+{
+    <DIFF>
     (
         LOOKAHEAD(2)
-        key=Key() <FROM> record=<NUMERIC>
-        {
-            jjtThis.command(new AuditSymbol(key, Long.parseLong(record.image)));
-        }
+        key=Key() <IN>
+    )?
+    (
+        LOOKAHEAD(3)
+        record=<NUMERIC> start=TimestampReadCommand() (end=TimestampReadCommand())?
+        { return new DiffSymbol(key, Long.parseLong(record.image), start, end); }
       |
+        key=Key()
+        (
+            LOOKAHEAD(3)
+            start=TimestampReadCommand() end=TimestampReadCommand()
+            { return new DiffSymbol(key, -1, start, end); }
+          |
+            start=TimestampReadCommand()
+            { return new DiffSymbol(key, -1, start, null); }
+        )
+    )
+}
+
+CommandSymbol InventoryCommand() : {}
+{
+    <INVENTORY>
+    { return InventorySymbol.INSTANCE; }
+}
+
+CommandSymbol JsonifyCommand() : {
+    Token record = null;
+    Collection<Long> records = null;
+    TimestampSymbol timestamp = null;
+    boolean identifier = false;
+}
+{
+    <JSONIFY>
+    (
+        LOOKAHEAD(2)
         record=<NUMERIC>
-        {
-            jjtThis.command(new AuditSymbol(null, Long.parseLong(record.image)));
-        }
+        { return new JsonifySymbol(Long.parseLong(record.image), identifier); }
+      |
+        records=RecordCollection()
+        { return new JsonifySymbol(records, identifier); }
     )
+    (<WITH> <RESERVED_IDENTIFIER> { identifier = true; })?
+    (timestamp=TimestampReadCommand())?
 }
 
-void VerifyCommand() #Command :
+CommandSymbol NavigateCommand() : {
+    Collection<KeyTokenSymbol<?>> keys;
+    Token record = null;
+    Collection<Long> records = null;
+    TimestampSymbol timestamp = null;
+}
 {
+    <NAVIGATE> keys=KeyCollection()
+    (
+        (<WHERE> DisjunctionExpression())
+        { return new NavigateSymbol(keys, (String)null, timestamp); }
+      |
+        <FROM>
+        (
+            record=<NUMERIC> (timestamp=TimestampReadCommand())?
+            { return new NavigateSymbol(keys, Long.parseLong(record.image), timestamp); }
+          |
+            records=RecordCollection() (timestamp=TimestampReadCommand())?
+            { return new NavigateSymbol(keys, records, timestamp); }
+        )
+    )?
+}
+
+CommandSymbol ReconcileCommand() : {
     KeyTokenSymbol<?> key;
-    ValueTokenSymbol<?> value;
     Token record;
-    TimestampSymbol timestamp = null;
+    Collection<ValueTokenSymbol<?>> values;
 }
 {
-    <VERIFY> key=Key() <AS> value=UnaryValue() <IN> record=<NUMERIC>
-    (timestamp=TimestampReadingCommand())?
-    {
-        jjtThis.command(new VerifySymbol(key, value, Long.parseLong(record.image), timestamp));
-    }
+    <RECONCILE> key=Key() <IN> record=<NUMERIC> <WITH> values=ValueCollection()
+    { return new ReconcileSymbol(key, Long.parseLong(record.image), values); }
 }
 
-void SearchCommand() #Command :
+CommandSymbol ReviewCommand() : {
+    KeyTokenSymbol<?> key = null;
+    Token record;
+    TimestampSymbol start = null;
+    TimestampSymbol end = null;
+}
 {
-    KeyTokenSymbol<?> key;
-    Token query;
+    <REVIEW>
+    (
+        LOOKAHEAD(2)
+        key=Key() <IN>
+    )?
+    record=<NUMERIC>
+    (
+        (start=TimestampReadCommand())
+        (end=TimestampReadCommand())?
+    )?
+    { return new ReviewSymbol(key, Long.parseLong(record.image), start, end); }
+}
+
+CommandSymbol TraceCommand() : {
+    Token record = null;
+    Collection<Long> records = null;
+    TimestampSymbol timestamp = null;
 }
 {
-    <SEARCH> key=Key() <FOR> query=<QUOTED_STRING>
-    {
-        jjtThis.command(new SearchSymbol(key, query.image));
-    }
+    <TRACE>
+    (
+        LOOKAHEAD(2)
+        record=<NUMERIC>
+        { return new TraceSymbol(Long.parseLong(record.image), timestamp); }
+      |
+        records=RecordCollection()
+        { return new TraceSymbol(records, timestamp); }
+    )
+    (timestamp=TimestampReadCommand())?
 }
 
-void TransactionOperations() : {}
+// Transaction Operations
+CommandSymbol TransactionOperations() : {
+    CommandSymbol cmd;
+}
 {
-    StageCommand()
-  |
-    CommitCommand()
-  |
-    AbortCommand()
+    (
+        cmd = StageCommand()
+      |
+        cmd = CommitCommand()
+      |
+        cmd = AbortCommand()
+    )
+    { return cmd; }
 }
 
-void StageCommand() #Command : {}
+CommandSymbol StageCommand() : {}
 {
     <STAGE>
-    {
-        jjtThis.command(StageSymbol.INSTANCE);
-    }
+    { return StageSymbol.INSTANCE; }
 }
 
-void CommitCommand() #Command : {}
+CommandSymbol CommitCommand() : {}
 {
     <COMMIT>
-    {
-        jjtThis.command(CommitSymbol.INSTANCE);
-    }
+    { return CommitSymbol.INSTANCE; }
 }
 
-void AbortCommand() #Command : {}
+CommandSymbol AbortCommand() : {}
 {
     <ABORT>
-    {
-        jjtThis.command(AbortSymbol.INSTANCE);
-    }
+    { return AbortSymbol.INSTANCE; }
 }
 
-void RevertCommand() #Command : {
+CommandSymbol RevertCommand() : {
     KeyTokenSymbol<?> key = null;
     Token record = null;
     Collection<KeyTokenSymbol<?>> keys = null;
@@ -1178,34 +1351,38 @@ void RevertCommand() #Command : {
     (
         LOOKAHEAD(3)
         key=Key() <IN> record=<NUMERIC>
-        timestamp=TimestampReadingCommand()
-        {
-            jjtThis.command(new RevertSymbol(key, Long.parseLong(record.image), timestamp));
-        }
+        timestamp=TimestampReadCommand()
+        { return new RevertSymbol(key, Long.parseLong(record.image), timestamp); }
       |
         LOOKAHEAD(3)
         key=Key() <IN> records=RecordCollection()
-        timestamp=TimestampReadingCommand()
-        {
-            jjtThis.command(new RevertSymbol(key, records, timestamp));
-        }
+        timestamp=TimestampReadCommand()
+        { return new RevertSymbol(key, records, timestamp); }
       |
-        LOOKAHEAD(3)
+        LOOKAHEAD(7)
         keys=KeyCollection() <IN> record=<NUMERIC>
-        timestamp=TimestampReadingCommand()
-        {
-            jjtThis.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
-        }
+        timestamp=TimestampReadCommand()
+        { return new RevertSymbol(keys, Long.parseLong(record.image), timestamp); }
       |
         keys=KeyCollection() <IN> records=RecordCollection()
-        timestamp=TimestampReadingCommand()
-        {
-            jjtThis.command(new RevertSymbol(keys, records, timestamp));
-        }
+        timestamp=TimestampReadCommand()
+        { return new RevertSymbol(keys, records, timestamp); }
     )
 }
 
 // Utility parsing rules
+Collection<ValueTokenSymbol<?>> ValueCollection() : {
+    ValueTokenSymbol<?> value;
+    Collection<ValueTokenSymbol<?>> values = Lists.newArrayList();
+}
+{
+    <OPEN_BRACKET>
+        value=UnaryValue() { values.add(value); }
+        (<COMMA> value=UnaryValue() { values.add(value); })*
+    <CLOSE_BRACKET>
+    { return values; }
+}
+
 Collection RecordCollection() :
 {
     Token record;
diff --git a/src/main/java/com/cinchapi/ccl/generated/Grammar.java b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
index 18d1fe84..34ef1904 100644
--- a/src/main/java/com/cinchapi/ccl/generated/Grammar.java
+++ b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
@@ -22,6 +22,7 @@
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.PageSymbol;
 import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 import com.cinchapi.ccl.syntax.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
@@ -78,6 +79,17 @@ public Object transformValue(String token) {
         return valueTransformFunction.apply(token);
     }
 
+    private boolean isValidJson(String json) {
+        // Basic JSON validation
+        int braceCount = 0;
+        for(char c : json.toCharArray()) {
+            if(c == '{') braceCount++;
+            if(c == '}') braceCount--;
+            if(braceCount < 0) return false;
+        }
+        return braceCount == 0;
+    }
+
   final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree) Start */
   ASTStart jjtn000 = new ASTStart(JJTSTART);
   boolean jjtc000 = true;
@@ -94,18 +106,26 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
       case LINK:
       case UNLINK:
       case SELECT:
-      case FETCH:
       case GET:
+      case FIND:
       case DESCRIBE:
-      case AUDIT:
       case VERIFY:
       case SEARCH:
+      case BROWSE:
+      case CHRONOLOGIZE:
+      case DIFF:
+      case INVENTORY:
+      case JSONIFY:
+      case NAVIGATE:
+      case RECONCILE:
+      case REVIEW:
+      case TRACE:
       case STAGE:
       case COMMIT:
       case ABORT:
       case REVERT:{
         Command();
-        jj_consume_token(79);
+        jj_consume_token(88);
         break;
         }
       default:
@@ -140,18 +160,18 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
             jj_la1[2] = jj_gen;
             ;
           }
-          jj_consume_token(79);
+          jj_consume_token(88);
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case PAGE:
           case SIZE:{
             Page();
-            jj_consume_token(79);
+            jj_consume_token(88);
             break;
             }
           case ORDER:{
             Order();
-            jj_consume_token(79);
+            jj_consume_token(88);
             break;
             }
           case NUMERIC:
@@ -160,7 +180,7 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
           case ALPHANUMERIC:
           case PERIOD_SEPARATED_STRING:{
             Function();
-            jj_consume_token(79);
+            jj_consume_token(88);
             break;
             }
           default:
@@ -211,12 +231,20 @@ final public ASTStart generateAST() throws ParseException {/*@bgen(jjtree) Start
       case LINK:
       case UNLINK:
       case SELECT:
-      case FETCH:
       case GET:
+      case FIND:
       case DESCRIBE:
-      case AUDIT:
       case VERIFY:
       case SEARCH:
+      case BROWSE:
+      case CHRONOLOGIZE:
+      case DIFF:
+      case INVENTORY:
+      case JSONIFY:
+      case NAVIGATE:
+      case RECONCILE:
+      case REVIEW:
+      case TRACE:
       case STAGE:
       case COMMIT:
       case ABORT:
@@ -463,14 +491,9 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
       case LINKS_TO:{
         operator = LinksToOperator();
         value1 = LinksToValue();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case TIMESTAMP:{
+        if (jj_2_3(2)) {
           timestamp = Timestamp();
-          break;
-          }
-        default:
-          jj_la1[13] = jj_gen;
+        } else {
           ;
         }
         break;
@@ -481,14 +504,9 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
       case NOT_LIKE:{
         operator = RegexBasedOperator();
         value1 = RegexValue();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case TIMESTAMP:{
+        if (jj_2_4(2)) {
           timestamp = Timestamp();
-          break;
-          }
-        default:
-          jj_la1[14] = jj_gen;
+        } else {
           ;
         }
         break;
@@ -498,14 +516,9 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
       case CLOSE_ANGLE_BRACKET:{
         operator = UnaryOperator();
         value1 = UnaryValue();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case TIMESTAMP:{
+        if (jj_2_5(2)) {
           timestamp = Timestamp();
-          break;
-          }
-        default:
-          jj_la1[15] = jj_gen;
+        } else {
           ;
         }
         break;
@@ -514,20 +527,15 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
         operator = BinaryOperator();
         value1 = BinaryValue();
         value2 = BinaryValue();
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case TIMESTAMP:{
+        if (jj_2_6(2)) {
           timestamp = Timestamp();
-          break;
-          }
-        default:
-          jj_la1[16] = jj_gen;
+        } else {
           ;
         }
         break;
         }
       default:
-        jj_la1[17] = jj_gen;
+        jj_la1[13] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -561,7 +569,7 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
 
   final public KeyTokenSymbol Key() throws ParseException {FunctionKeySymbol function;
   Token key;
-    if (jj_2_3(2)) {
+    if (jj_2_7(2)) {
       function = KeyFunction();
 {if ("" != null) return function;}
     } else {
@@ -593,7 +601,7 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
           break;
           }
         default:
-          jj_la1[18] = jj_gen;
+          jj_la1[14] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -606,7 +614,7 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
         break;
         }
       default:
-        jj_la1[19] = jj_gen;
+        jj_la1[15] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -620,7 +628,7 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
   String value = "";
   List<String> records = Lists.newArrayList();
   ASTStart ccl;
-    if (jj_2_5(2)) {
+    if (jj_2_9(2)) {
       function = ValueFunction();
 {if ("" != null) return function;}
     } else {
@@ -659,12 +667,12 @@ final public void RelationalExpression() throws ParseException {/*@bgen(jjtree)
             break;
             }
           default:
-            jj_la1[20] = jj_gen;
+            jj_la1[16] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
 value += (value.equals("")) ? word.image : " " + word.image;
-          if (jj_2_4(2)) {
+          if (jj_2_8(2)) {
             ;
           } else {
             break label_3;
@@ -700,7 +708,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         break;
         }
       default:
-        jj_la1[21] = jj_gen;
+        jj_la1[17] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -746,16 +754,16 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 80:{
-          word = jj_consume_token(80);
+        case 89:{
+          word = jj_consume_token(89);
           break;
           }
-        case 81:{
-          word = jj_consume_token(81);
+        case 90:{
+          word = jj_consume_token(90);
           break;
           }
         default:
-          jj_la1[22] = jj_gen;
+          jj_la1[18] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -768,7 +776,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         else {
             value += " " + word.image;
         }
-        if (jj_2_6(4)) {
+        if (jj_2_10(4)) {
           ;
         } else {
           break label_4;
@@ -784,8 +792,8 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
     case ALPHANUMERIC:
     case PERIOD_SEPARATED_STRING:
     case NON_ALPHANUMERIC_AND_ALPHANUMERIC:
-    case 80:
-    case 81:{
+    case 89:
+    case 90:{
       label_5:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -813,16 +821,16 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 80:{
-          word = jj_consume_token(80);
+        case 89:{
+          word = jj_consume_token(89);
           break;
           }
-        case 81:{
-          word = jj_consume_token(81);
+        case 90:{
+          word = jj_consume_token(90);
           break;
           }
         default:
-          jj_la1[23] = jj_gen;
+          jj_la1[19] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -835,7 +843,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         else {
             value += " " + word.image;
         }
-        if (jj_2_7(3)) {
+        if (jj_2_11(3)) {
           ;
         } else {
           break label_5;
@@ -850,7 +858,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
       break;
       }
     default:
-      jj_la1[24] = jj_gen;
+      jj_la1[20] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -863,7 +871,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
   String value = "";
   List<String> records = Lists.newArrayList();
   ASTStart ccl;
-    if (jj_2_8(2)) {
+    if (jj_2_12(2)) {
       function = ValueFunction();
 {if ("" != null) return function;}
     } else {
@@ -900,7 +908,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           break;
           }
         default:
-          jj_la1[25] = jj_gen;
+          jj_la1[21] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -935,7 +943,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         break;
         }
       default:
-        jj_la1[26] = jj_gen;
+        jj_la1[22] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -968,7 +976,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
       break;
       }
     default:
-      jj_la1[27] = jj_gen;
+      jj_la1[23] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -991,7 +999,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
       break;
       }
     default:
-      jj_la1[28] = jj_gen;
+      jj_la1[24] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1017,7 +1025,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
       break;
       }
     default:
-      jj_la1[29] = jj_gen;
+      jj_la1[25] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1049,12 +1057,12 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         break;
         }
       default:
-        jj_la1[30] = jj_gen;
+        jj_la1[26] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
 timestamp += (timestamp.equals("")) ? word.image : " " + word.image;
-      if (jj_2_9(2)) {
+      if (jj_2_13(2)) {
         ;
       } else {
         break label_6;
@@ -1064,7 +1072,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
     throw new Error("Missing return statement in function");
 }
 
-  final public TimestampSymbol TimestampReadingCommand() throws ParseException {Token word;
+  final public TimestampSymbol TimestampReadCommand() throws ParseException {Token word;
   String timestamp = "";
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case TIMESTAMP:{
@@ -1080,7 +1088,7 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
       break;
       }
     default:
-      jj_la1[31] = jj_gen;
+      jj_la1[27] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1112,12 +1120,12 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
         break;
         }
       default:
-        jj_la1[32] = jj_gen;
+        jj_la1[28] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
 timestamp += (timestamp.equals("")) ? word.image : " " + word.image;
-      if (jj_2_10(2)) {
+      if (jj_2_14(2)) {
         ;
       } else {
         break label_7;
@@ -1142,7 +1150,7 @@ final public void Page() throws ParseException {/*@bgen(jjtree) Page */
           break;
           }
         default:
-          jj_la1[33] = jj_gen;
+          jj_la1[29] = jj_gen;
           ;
         }
         break;
@@ -1155,13 +1163,13 @@ final public void Page() throws ParseException {/*@bgen(jjtree) Page */
           break;
           }
         default:
-          jj_la1[34] = jj_gen;
+          jj_la1[30] = jj_gen;
           ;
         }
         break;
         }
       default:
-        jj_la1[35] = jj_gen;
+        jj_la1[31] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1220,7 +1228,7 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
           break;
           }
         default:
-          jj_la1[36] = jj_gen;
+          jj_la1[32] = jj_gen;
           break label_8;
         }
         jj_consume_token(COMMA);
@@ -1275,13 +1283,13 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
         break;
         }
       default:
-        jj_la1[37] = jj_gen;
+        jj_la1[33] = jj_gen;
         ;
       }
       break;
       }
     default:
-      jj_la1[38] = jj_gen;
+      jj_la1[34] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1292,7 +1300,7 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
       break;
       }
     default:
-      jj_la1[39] = jj_gen;
+      jj_la1[35] = jj_gen;
       ;
     }
 if(direction != null) {
@@ -1329,7 +1337,7 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
       break;
       }
     default:
-      jj_la1[40] = jj_gen;
+      jj_la1[36] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1349,7 +1357,7 @@ final public void Order() throws ParseException {/*@bgen(jjtree) Order */
       break;
       }
     default:
-      jj_la1[41] = jj_gen;
+      jj_la1[37] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1361,7 +1369,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
     boolean jjtc000 = true;
     jjtree.openNodeScope(jjtn000);FunctionTokenSymbol function;
     try {
-      if (jj_2_11(2)) {
+      if (jj_2_15(2)) {
         function = KeyFunction();
       } else {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -1370,7 +1378,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[42] = jj_gen;
+          jj_la1[38] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1423,7 +1431,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
       break;
       }
     default:
-      jj_la1[43] = jj_gen;
+      jj_la1[39] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -1441,7 +1449,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
   TimestampSymbol timestamp = null;
     function = jj_consume_token(ALPHANUMERIC);
     jj_consume_token(OPEN_PARENTHESES);
-    if (jj_2_12(3)) {
+    if (jj_2_16(3)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SIGNED_INTEGER:{
         key = jj_consume_token(SIGNED_INTEGER);
@@ -1460,7 +1468,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         break;
         }
       default:
-        jj_la1[44] = jj_gen;
+        jj_la1[40] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1478,11 +1486,11 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         break;
         }
       default:
-        jj_la1[45] = jj_gen;
+        jj_la1[41] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
-    } else if (jj_2_13(3)) {
+    } else if (jj_2_17(3)) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case SIGNED_INTEGER:{
         key = jj_consume_token(SIGNED_INTEGER);
@@ -1501,7 +1509,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         break;
         }
       default:
-        jj_la1[46] = jj_gen;
+        jj_la1[42] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1519,7 +1527,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[47] = jj_gen;
+          jj_la1[43] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1532,7 +1540,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[48] = jj_gen;
+            jj_la1[44] = jj_gen;
             break label_9;
           }
           jj_consume_token(COMMA);
@@ -1546,7 +1554,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[49] = jj_gen;
+            jj_la1[45] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -1568,7 +1576,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[50] = jj_gen;
+          jj_la1[46] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1581,7 +1589,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[51] = jj_gen;
+            jj_la1[47] = jj_gen;
             break label_10;
           }
           jj_consume_token(COMMA);
@@ -1595,7 +1603,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
             break;
             }
           default:
-            jj_la1[52] = jj_gen;
+            jj_la1[48] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -1609,7 +1617,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
         break;
         }
       default:
-        jj_la1[53] = jj_gen;
+        jj_la1[49] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1637,7 +1645,7 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[54] = jj_gen;
+          jj_la1[50] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
@@ -1659,14 +1667,14 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
           break;
           }
         default:
-          jj_la1[55] = jj_gen;
+          jj_la1[51] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[56] = jj_gen;
+        jj_la1[52] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -1674,1232 +1682,1400 @@ final public void Function() throws ParseException {/*@bgen(jjtree) Function */
     throw new Error("Missing return statement in function");
 }
 
-  final public void Command() throws ParseException {
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case ADD:
-    case SET:
-    case REMOVE:
-    case CLEAR:
-    case VERIFY_AND_SWAP:
-    case VERIFY_OR_SET:{
-      DataModificationOperations();
-      break;
-      }
-    case INSERT:{
-      RecordOperations();
-      break;
+  final public void Command() throws ParseException {/*@bgen(jjtree) Command */
+    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
+    boolean jjtc000 = true;
+    jjtree.openNodeScope(jjtn000);CommandSymbol cmd;
+    try {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ADD:
+      case SET:
+      case REMOVE:
+      case CLEAR:
+      case VERIFY_AND_SWAP:
+      case VERIFY_OR_SET:{
+        cmd = DataModificationOperations();
+        break;
+        }
+      case INSERT:{
+        cmd = RecordOperations();
+        break;
+        }
+      case LINK:
+      case UNLINK:{
+        cmd = LinkOperations();
+        break;
+        }
+      case SELECT:
+      case GET:
+      case FIND:
+      case DESCRIBE:
+      case VERIFY:
+      case SEARCH:
+      case BROWSE:
+      case CHRONOLOGIZE:
+      case DIFF:
+      case INVENTORY:
+      case JSONIFY:
+      case NAVIGATE:
+      case RECONCILE:
+      case REVIEW:
+      case TRACE:{
+        cmd = QueryOperations();
+        break;
+        }
+      case STAGE:
+      case COMMIT:
+      case ABORT:{
+        cmd = TransactionOperations();
+        break;
+        }
+      case REVERT:{
+        cmd = RevertCommand();
+        break;
+        }
+      default:
+        jj_la1[53] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    case LINK:
-    case UNLINK:{
-      LinkOperations();
-      break;
+jjtree.closeNodeScope(jjtn000, true);
+      jjtc000 = false;
+jjtn000.command(cmd);
+    } catch (Throwable jjte000) {
+if (jjtc000) {
+        jjtree.clearNodeScope(jjtn000);
+        jjtc000 = false;
+      } else {
+        jjtree.popNode();
       }
-    case SELECT:
-    case FETCH:
-    case GET:
-    case DESCRIBE:
-    case AUDIT:
-    case VERIFY:
-    case SEARCH:{
-      QueryOperations();
-      break;
+      if (jjte000 instanceof RuntimeException) {
+        {if (true) throw (RuntimeException)jjte000;}
       }
-    case STAGE:
-    case COMMIT:
-    case ABORT:{
-      TransactionOperations();
-      break;
+      if (jjte000 instanceof ParseException) {
+        {if (true) throw (ParseException)jjte000;}
       }
-    case REVERT:{
-      RevertCommand();
-      break;
+      {if (true) throw (Error)jjte000;}
+    } finally {
+if (jjtc000) {
+        jjtree.closeNodeScope(jjtn000, true);
       }
-    default:
-      jj_la1[57] = jj_gen;
-      jj_consume_token(-1);
-      throw new ParseException();
     }
 }
 
-  final public void DataModificationOperations() throws ParseException {
+  final public CommandSymbol DataModificationOperations() throws ParseException {CommandSymbol cmd;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case ADD:{
-      AddCommand();
+      cmd = AddCommand();
       break;
       }
     case SET:{
-      SetCommand();
+      cmd = SetCommand();
       break;
       }
     case REMOVE:{
-      RemoveCommand();
+      cmd = RemoveCommand();
       break;
       }
     case CLEAR:{
-      ClearCommand();
+      cmd = ClearCommand();
       break;
       }
     case VERIFY_AND_SWAP:{
-      VerifyAndSwapCommand();
+      cmd = VerifyAndSwapCommand();
       break;
       }
     case VERIFY_OR_SET:{
-      VerifyOrSetCommand();
+      cmd = VerifyOrSetCommand();
       break;
       }
     default:
-      jj_la1[58] = jj_gen;
+      jj_la1[54] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+{if ("" != null) return cmd;}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void AddCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+  final public CommandSymbol AddCommand() throws ParseException {KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
-    Token record;
-    try {
-      jj_consume_token(ADD);
-      key = Key();
-      jj_consume_token(AS);
-      value = UnaryValue();
+    Token record = null;
+    Collection records = null;
+    jj_consume_token(ADD);
+    key = Key();
+    jj_consume_token(AS);
+    value = UnaryValue();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:{
       jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(new AddSymbol(key, value, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMERIC:{
+        record = jj_consume_token(NUMERIC);
+{if ("" != null) return new AddSymbol(key, value, Long.parseLong(record.image));}
+        break;
+        }
+      case OPEN_BRACKET:{
+        records = RecordCollection();
+{if ("" != null) return new AddSymbol(key, value, records);}
+        break;
+        }
+      default:
+        jj_la1[55] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+      break;
       }
+    default:
+      jj_la1[56] = jj_gen;
+      ;
     }
+{if ("" != null) return new AddSymbol(key, value);}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void SetCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+  final public CommandSymbol SetCommand() throws ParseException {KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
-    try {
-      jj_consume_token(SET);
-      key = Key();
+    jj_consume_token(SET);
+    key = Key();
+    jj_consume_token(AS);
+    value = UnaryValue();
+    jj_consume_token(IN);
+    record = jj_consume_token(NUMERIC);
+{if ("" != null) return new SetSymbol(key, value, Long.parseLong(record.image));}
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol RemoveCommand() throws ParseException {KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value = null;
+    Token record;
+    Collection records = null;
+    jj_consume_token(REMOVE);
+    key = Key();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case AS:{
       jj_consume_token(AS);
       value = UnaryValue();
-      jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(new SetSymbol(key, value, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
+      break;
       }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
+    default:
+      jj_la1[57] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case FROM:{
+      jj_consume_token(FROM);
+      break;
       }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
+    case IN:{
+      jj_consume_token(IN);
+      break;
       }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+    default:
+      jj_la1[58] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case NUMERIC:{
+      record = jj_consume_token(NUMERIC);
+{if ("" != null) return new RemoveSymbol(key, value, Long.parseLong(record.image));}
+      break;
+      }
+    case OPEN_BRACKET:{
+      records = RecordCollection();
+{if ("" != null) return new RemoveSymbol(key, value, records);}
+      break;
       }
+    default:
+      jj_la1[59] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void RemoveCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
-    ValueTokenSymbol<?> value = null;
-    Token record;
-    try {
-      jj_consume_token(REMOVE);
+  final public CommandSymbol ClearCommand() throws ParseException {KeyTokenSymbol<?> key = null;
+    Collection<KeyTokenSymbol<?>> keys = null;
+    Token record = null;
+    Collection records = null;
+    jj_consume_token(CLEAR);
+    if (jj_2_18(2)) {
+      record = jj_consume_token(NUMERIC);
+{if ("" != null) return new ClearSymbol((KeyTokenSymbol<?>)null, Long.parseLong(record.image));}
+    } else if (jj_2_19(3)) {
+      records = RecordCollection();
+{if ("" != null) return new ClearSymbol((KeyTokenSymbol<?>)null, records);}
+    } else if (jj_2_20(3)) {
       key = Key();
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case AS:{
-        jj_consume_token(AS);
-        value = UnaryValue();
-        break;
-        }
-      default:
-        jj_la1[59] = jj_gen;
-        ;
-      }
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case FROM:{
-        jj_consume_token(FROM);
-        break;
-        }
-      case IN:{
-        jj_consume_token(IN);
-        break;
-        }
-      default:
-        jj_la1[60] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
+      jj_consume_token(FROM);
       record = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(new RemoveSymbol(key, value, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
-      }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
-      }
-    }
-}
-
-  final public void ClearCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
-    Token record;
-    Collection<KeyTokenSymbol<?>> keys = null;
-    Collection records = null;
-    try {
-      jj_consume_token(CLEAR);
-      if (jj_2_14(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new ClearSymbol(key, Long.parseLong(record.image)));
-      } else if (jj_2_15(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        records = RecordCollection();
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new ClearSymbol(key, records));
-      } else if (jj_2_16(3)) {
-        keys = KeyCollection();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new ClearSymbol(keys, Long.parseLong(record.image)));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case OPEN_BRACKET:{
-          keys = KeyCollection();
-          jj_consume_token(FROM);
-          records = RecordCollection();
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new ClearSymbol(keys, records));
-          break;
-          }
-        default:
-          jj_la1[61] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-      }
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
-      }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
-      }
+{if ("" != null) return new ClearSymbol(key, Long.parseLong(record.image));}
+    } else if (jj_2_21(3)) {
+      key = Key();
+      jj_consume_token(FROM);
+      records = RecordCollection();
+{if ("" != null) return new ClearSymbol(key, records);}
+    } else if (jj_2_22(7)) {
+      keys = KeyCollection();
+      jj_consume_token(FROM);
+      record = jj_consume_token(NUMERIC);
+{if ("" != null) return new ClearSymbol(keys, Long.parseLong(record.image));}
+    } else if (jj_2_23(7)) {
+      keys = KeyCollection();
+      jj_consume_token(FROM);
+      records = RecordCollection();
+{if ("" != null) return new ClearSymbol(keys, records);}
+    } else {
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void VerifyAndSwapCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+  final public CommandSymbol VerifyAndSwapCommand() throws ParseException {KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> expected;
     ValueTokenSymbol<?> replacement;
     Token record;
-    try {
-      jj_consume_token(VERIFY_AND_SWAP);
-      key = Key();
-      jj_consume_token(AS);
-      expected = UnaryValue();
-      jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
-      jj_consume_token(WITH);
-      replacement = UnaryValue();
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(new VerifyAndSwapSymbol(key, expected, replacement, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
-      }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
-      }
-    }
+    jj_consume_token(VERIFY_AND_SWAP);
+    key = Key();
+    jj_consume_token(AS);
+    expected = UnaryValue();
+    jj_consume_token(IN);
+    record = jj_consume_token(NUMERIC);
+    jj_consume_token(WITH);
+    replacement = UnaryValue();
+{if ("" != null) return new VerifyAndSwapSymbol(key, expected, replacement, Long.parseLong(record.image));}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void VerifyOrSetCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+  final public CommandSymbol VerifyOrSetCommand() throws ParseException {KeyTokenSymbol<?> key;
     ValueTokenSymbol<?> value;
     Token record;
-    try {
-      jj_consume_token(VERIFY_OR_SET);
-      key = Key();
-      jj_consume_token(AS);
-      value = UnaryValue();
-      jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(new VerifyOrSetSymbol(key, value, Long.parseLong(record.image)));
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
-      }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
-      }
-    }
+    jj_consume_token(VERIFY_OR_SET);
+    key = Key();
+    jj_consume_token(AS);
+    value = UnaryValue();
+    jj_consume_token(IN);
+    record = jj_consume_token(NUMERIC);
+{if ("" != null) return new VerifyOrSetSymbol(key, value, Long.parseLong(record.image));}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void RecordOperations() throws ParseException {
-    InsertCommand();
+  final public CommandSymbol RecordOperations() throws ParseException {CommandSymbol cmd;
+    cmd = InsertCommand();
+{if ("" != null) return cmd;}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void InsertCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);String json;
+  final public CommandSymbol InsertCommand() throws ParseException {String json;
     Token record = null;
     Collection records = null;
-    try {
-      jj_consume_token(INSERT);
-      json = JsonObject();
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case IN:
-      case INTO:{
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:{
-          jj_consume_token(IN);
-          break;
-          }
-        case INTO:{
-          jj_consume_token(INTO);
-          break;
-          }
-        default:
-          jj_la1[62] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+    jj_consume_token(INSERT);
+    json = JsonObject();
+// Basic JSON validation
+        if(!isValidJson(json)) {
+            {if (true) throw new ParseException("Malformed JSON");}
         }
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case NUMERIC:{
-          record = jj_consume_token(NUMERIC);
-jjtn000.command(new InsertSymbol(json, Long.parseLong(record.image)));
-          break;
-          }
-        case OPEN_BRACKET:{
-          records = RecordCollection();
-jjtn000.command(new InsertSymbol(json, records));
-          break;
-          }
-        default:
-          jj_la1[63] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case INTO:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:{
+        jj_consume_token(IN);
+        break;
         }
+      case INTO:{
+        jj_consume_token(INTO);
         break;
         }
       default:
-        jj_la1[64] = jj_gen;
-        ;
+        jj_la1[60] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-if(record == null && records == null) {
-            jjtn000.command(new InsertSymbol(json));
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case NUMERIC:{
+        record = jj_consume_token(NUMERIC);
+{if ("" != null) return new InsertSymbol(json, Long.parseLong(record.image));}
+        break;
         }
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
+      case OPEN_BRACKET:{
+        records = RecordCollection();
+{if ("" != null) return new InsertSymbol(json, records);}
+        break;
+        }
+      default:
+        jj_la1[61] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+      break;
       }
+    default:
+      jj_la1[62] = jj_gen;
+      ;
     }
+{if ("" != null) return new InsertSymbol(json);}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void LinkOperations() throws ParseException {
+  final public CommandSymbol LinkOperations() throws ParseException {CommandSymbol cmd;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case LINK:{
-      LinkCommand();
+      cmd = LinkCommand();
       break;
       }
     case UNLINK:{
-      UnlinkCommand();
+      cmd = UnlinkCommand();
       break;
       }
     default:
-      jj_la1[65] = jj_gen;
+      jj_la1[63] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+{if ("" != null) return cmd;}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void LinkCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+  final public CommandSymbol LinkCommand() throws ParseException {KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
-    try {
-      jj_consume_token(LINK);
-      key = Key();
-      jj_consume_token(FROM);
-      source = jj_consume_token(NUMERIC);
-      jj_consume_token(TO);
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NUMERIC:{
-        destination = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
+    jj_consume_token(LINK);
+    key = Key();
+    jj_consume_token(FROM);
+    source = jj_consume_token(NUMERIC);
+    jj_consume_token(TO);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case NUMERIC:{
+      destination = jj_consume_token(NUMERIC);
 Collection dest = new ArrayList();
             dest.add(Long.parseLong(destination.image));
-            jjtn000.command(new LinkSymbol(key, Long.parseLong(source.image), dest));
-        break;
-        }
-      case OPEN_BRACKET:{
-        destinations = RecordCollection();
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new LinkSymbol(key, Long.parseLong(source.image), destinations));
-        break;
-        }
-      default:
-        jj_la1[66] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
+            {if ("" != null) return new LinkSymbol(key, Long.parseLong(source.image), dest);}
+      break;
       }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
-      }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+    case OPEN_BRACKET:{
+      destinations = RecordCollection();
+{if ("" != null) return new LinkSymbol(key, Long.parseLong(source.image), destinations);}
+      break;
       }
+    default:
+      jj_la1[64] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void UnlinkCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
+  final public CommandSymbol UnlinkCommand() throws ParseException {KeyTokenSymbol<?> key;
     Token source;
     Token destination;
     Collection destinations = null;
-    try {
-      jj_consume_token(UNLINK);
-      key = Key();
-      jj_consume_token(FROM);
-      source = jj_consume_token(NUMERIC);
-      jj_consume_token(TO);
-      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-      case NUMERIC:{
-        destination = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
+    jj_consume_token(UNLINK);
+    key = Key();
+    jj_consume_token(FROM);
+    source = jj_consume_token(NUMERIC);
+    jj_consume_token(TO);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case NUMERIC:{
+      destination = jj_consume_token(NUMERIC);
 Collection dest = new ArrayList();
             dest.add(Long.parseLong(destination.image));
-            jjtn000.command(new UnlinkSymbol(key, Long.parseLong(source.image), dest));
-        break;
-        }
-      case OPEN_BRACKET:{
-        destinations = RecordCollection();
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new UnlinkSymbol(key, Long.parseLong(source.image), destinations));
-        break;
-        }
-      default:
-        jj_la1[67] = jj_gen;
-        jj_consume_token(-1);
-        throw new ParseException();
-      }
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
+            {if ("" != null) return new UnlinkSymbol(key, Long.parseLong(source.image), dest);}
+      break;
       }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+    case OPEN_BRACKET:{
+      destinations = RecordCollection();
+{if ("" != null) return new UnlinkSymbol(key, Long.parseLong(source.image), destinations);}
+      break;
       }
+    default:
+      jj_la1[65] = jj_gen;
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void QueryOperations() throws ParseException {
+  final public CommandSymbol QueryOperations() throws ParseException {CommandSymbol cmd;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case SELECT:{
-      SelectCommand();
-      break;
-      }
-    case FETCH:{
-      FetchCommand();
+      cmd = SelectCommand();
       break;
       }
     case GET:{
-      GetCommand();
+      cmd = GetCommand();
       break;
       }
-    case DESCRIBE:{
-      DescribeCommand();
+    case FIND:{
+      cmd = FindCommand();
       break;
       }
-    case AUDIT:{
-      AuditCommand();
+    case DESCRIBE:{
+      cmd = DescribeCommand();
       break;
       }
     case VERIFY:{
-      VerifyCommand();
+      cmd = VerifyCommand();
       break;
       }
     case SEARCH:{
-      SearchCommand();
+      cmd = SearchCommand();
+      break;
+      }
+    case BROWSE:{
+      cmd = BrowseCommand();
+      break;
+      }
+    case CHRONOLOGIZE:{
+      cmd = ChronologizeCommand();
+      break;
+      }
+    case DIFF:{
+      cmd = DiffCommand();
+      break;
+      }
+    case INVENTORY:{
+      cmd = InventoryCommand();
+      break;
+      }
+    case JSONIFY:{
+      cmd = JsonifyCommand();
+      break;
+      }
+    case NAVIGATE:{
+      cmd = NavigateCommand();
+      break;
+      }
+    case RECONCILE:{
+      cmd = ReconcileCommand();
+      break;
+      }
+    case REVIEW:{
+      cmd = ReviewCommand();
+      break;
+      }
+    case TRACE:{
+      cmd = TraceCommand();
       break;
       }
     default:
-      jj_la1[68] = jj_gen;
+      jj_la1[66] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+{if ("" != null) return cmd;}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void SelectCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
-    Token record;
+  final public CommandSymbol SelectCommand() throws ParseException {Collection<KeyTokenSymbol<?>> keys = null;
+    KeyTokenSymbol<?> key = null;
+    Token record = null;
+    Collection<Long> records = null;
     TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(SELECT);
-      key = Key();
+    jj_consume_token(SELECT);
+    if (jj_2_24(2)) {
+      keys = KeyCollection();
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case RESERVED_IDENTIFIER:
+      case NUMERIC:
+      case SIGNED_INTEGER:
+      case SIGNED_DECIMAL:
+      case ALPHANUMERIC:
+      case PERIOD_SEPARATED_STRING:{
+        key = Key();
+keys = new ArrayList<KeyTokenSymbol<?>>();
+            keys.add(key);
+        break;
+        }
+      default:
+        jj_la1[67] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
+      }
+    }
+    if (jj_2_25(2)) {
       jj_consume_token(FROM);
       record = jj_consume_token(NUMERIC);
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IN:
       case AS_OF:
       case TIMESTAMP:{
-        timestamp = TimestampReadingCommand();
+        timestamp = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[68] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ORDER:{
+        Order();
         break;
         }
       default:
         jj_la1[69] = jj_gen;
         ;
       }
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(new SelectSymbol(key, Long.parseLong(record.image), timestamp));
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PAGE:
+      case SIZE:{
+        Page();
+        break;
+        }
+      default:
+        jj_la1[70] = jj_gen;
+        ;
       }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
+{if ("" != null) return new SelectSymbol(keys, Long.parseLong(record.image), timestamp);}
+    } else if (jj_2_26(2)) {
+      jj_consume_token(FROM);
+      records = RecordCollection();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        timestamp = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[71] = jj_gen;
+        ;
       }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ORDER:{
+        Order();
+        break;
+        }
+      default:
+        jj_la1[72] = jj_gen;
+        ;
       }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PAGE:
+      case SIZE:{
+        Page();
+        break;
+        }
+      default:
+        jj_la1[73] = jj_gen;
+        ;
       }
-    }
-}
-
-  final public void FetchCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
-    Collection<KeyTokenSymbol<?>> keys = null;
-    Token record;
-    Collection records = null;
-    TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(FETCH);
-      if (jj_2_17(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
+{if ("" != null) return new SelectSymbol(keys, records, timestamp);}
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case WHERE:{
+        jj_consume_token(WHERE);
+        DisjunctionExpression();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IN:
         case AS_OF:
         case TIMESTAMP:{
-          timestamp = TimestampReadingCommand();
+          timestamp = TimestampReadCommand();
           break;
           }
         default:
-          jj_la1[70] = jj_gen;
+          jj_la1[74] = jj_gen;
           ;
         }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new FetchSymbol(key, Long.parseLong(record.image), timestamp));
-      } else if (jj_2_18(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        records = RecordCollection();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case AS_OF:
-        case TIMESTAMP:{
-          timestamp = TimestampReadingCommand();
+        case ORDER:{
+          Order();
           break;
           }
         default:
-          jj_la1[71] = jj_gen;
+          jj_la1[75] = jj_gen;
           ;
         }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new FetchSymbol(key, records, timestamp));
-      } else if (jj_2_19(3)) {
-        keys = KeyCollection();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case AS_OF:
-        case TIMESTAMP:{
-          timestamp = TimestampReadingCommand();
+        case PAGE:
+        case SIZE:{
+          Page();
           break;
           }
         default:
-          jj_la1[72] = jj_gen;
+          jj_la1[76] = jj_gen;
           ;
         }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new FetchSymbol(keys, Long.parseLong(record.image), timestamp));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case OPEN_BRACKET:{
-          keys = KeyCollection();
-          jj_consume_token(FROM);
-          records = RecordCollection();
-          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-          case IN:
-          case AS_OF:
-          case TIMESTAMP:{
-            timestamp = TimestampReadingCommand();
-            break;
-            }
-          default:
-            jj_la1[73] = jj_gen;
-            ;
-          }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new FetchSymbol(keys, records, timestamp));
-          break;
-          }
-        default:
-          jj_la1[74] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+{if ("" != null) return new SelectSymbol(keys, timestamp);}
+        break;
         }
+      default:
+        jj_la1[77] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
+    }
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol GetCommand() throws ParseException {KeyTokenSymbol<?> key = null;
+    Collection<KeyTokenSymbol<?>> keys = null;
+    Token record = null;
+    Collection records = null;
+    TimestampSymbol timestamp = null;
+    jj_consume_token(GET);
+    if (jj_2_27(7)) {
+      keys = KeyCollection();
+      jj_consume_token(WHERE);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case OPEN_PARENTHESES:
+      case RESERVED_IDENTIFIER:
+      case NUMERIC:
+      case SIGNED_INTEGER:
+      case SIGNED_DECIMAL:
+      case ALPHANUMERIC:
+      case PERIOD_SEPARATED_STRING:{
+        DisjunctionExpression();
+        break;
+        }
+      default:
+        jj_la1[78] = jj_gen;
+        ;
       }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        timestamp = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[79] = jj_gen;
+        ;
       }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ORDER:{
+        Order();
+        break;
+        }
+      default:
+        jj_la1[80] = jj_gen;
+        ;
       }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PAGE:
+      case SIZE:{
+        Page();
+        break;
+        }
+      default:
+        jj_la1[81] = jj_gen;
+        ;
+      }
+{if ("" != null) return new GetSymbol(keys, timestamp);}
+    } else if (jj_2_28(3)) {
+      key = Key();
+      jj_consume_token(FROM);
+      record = jj_consume_token(NUMERIC);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        timestamp = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[82] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ORDER:{
+        Order();
+        break;
+        }
+      default:
+        jj_la1[83] = jj_gen;
+        ;
       }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PAGE:
+      case SIZE:{
+        Page();
+        break;
+        }
+      default:
+        jj_la1[84] = jj_gen;
+        ;
+      }
+{if ("" != null) return new GetSymbol(key, Long.parseLong(record.image), timestamp);}
+    } else if (jj_2_29(3)) {
+      key = Key();
+      jj_consume_token(FROM);
+      records = RecordCollection();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        timestamp = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[85] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ORDER:{
+        Order();
+        break;
+        }
+      default:
+        jj_la1[86] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PAGE:
+      case SIZE:{
+        Page();
+        break;
+        }
+      default:
+        jj_la1[87] = jj_gen;
+        ;
+      }
+{if ("" != null) return new GetSymbol(key, records, timestamp);}
+    } else if (jj_2_30(7)) {
+      keys = KeyCollection();
+      jj_consume_token(FROM);
+      record = jj_consume_token(NUMERIC);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        timestamp = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[88] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ORDER:{
+        Order();
+        break;
+        }
+      default:
+        jj_la1[89] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PAGE:
+      case SIZE:{
+        Page();
+        break;
+        }
+      default:
+        jj_la1[90] = jj_gen;
+        ;
+      }
+{if ("" != null) return new GetSymbol(keys, Long.parseLong(record.image), timestamp);}
+    } else if (jj_2_31(3)) {
+      keys = KeyCollection();
+      jj_consume_token(FROM);
+      records = RecordCollection();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        timestamp = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[91] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case ORDER:{
+        Order();
+        break;
+        }
+      default:
+        jj_la1[92] = jj_gen;
+        ;
+      }
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case PAGE:
+      case SIZE:{
+        Page();
+        break;
+        }
+      default:
+        jj_la1[93] = jj_gen;
+        ;
+      }
+{if ("" != null) return new GetSymbol(keys, records, timestamp);}
+    } else {
+      jj_consume_token(-1);
+      throw new ParseException();
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void GetCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
-    Collection<KeyTokenSymbol<?>> keys = null;
-    Token record;
+  final public CommandSymbol FindCommand() throws ParseException {TimestampSymbol timestamp = null;
+    jj_consume_token(FIND);
+    DisjunctionExpression();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case AS_OF:
+    case TIMESTAMP:{
+      timestamp = TimestampReadCommand();
+      break;
+      }
+    default:
+      jj_la1[94] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case ORDER:{
+      Order();
+      break;
+      }
+    default:
+      jj_la1[95] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case PAGE:
+    case SIZE:{
+      Page();
+      break;
+      }
+    default:
+      jj_la1[96] = jj_gen;
+      ;
+    }
+{if ("" != null) return new FindSymbol(timestamp);}
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol DescribeCommand() throws ParseException {Token record = null;
     Collection records = null;
     TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(GET);
-      if (jj_2_20(3)) {
-        key = Key();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case AS_OF:
-        case TIMESTAMP:{
-          timestamp = TimestampReadingCommand();
-          break;
-          }
-        default:
-          jj_la1[75] = jj_gen;
-          ;
+    jj_consume_token(DESCRIBE);
+    if (jj_2_32(2)) {
+      record = jj_consume_token(NUMERIC);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        timestamp = TimestampReadCommand();
+        break;
         }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new GetSymbol(key, Long.parseLong(record.image), timestamp));
-      } else if (jj_2_21(3)) {
-        key = Key();
-        jj_consume_token(FROM);
+      default:
+        jj_la1[97] = jj_gen;
+        ;
+      }
+{if ("" != null) return new DescribeSymbol(Long.parseLong(record.image), timestamp);}
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case OPEN_BRACKET:{
         records = RecordCollection();
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case IN:
         case AS_OF:
         case TIMESTAMP:{
-          timestamp = TimestampReadingCommand();
+          timestamp = TimestampReadCommand();
           break;
           }
         default:
-          jj_la1[76] = jj_gen;
+          jj_la1[98] = jj_gen;
           ;
         }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new GetSymbol(key, records, timestamp));
-      } else if (jj_2_22(3)) {
-        keys = KeyCollection();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case AS_OF:
-        case TIMESTAMP:{
-          timestamp = TimestampReadingCommand();
-          break;
-          }
-        default:
-          jj_la1[77] = jj_gen;
-          ;
+{if ("" != null) return new DescribeSymbol(records, timestamp);}
+        break;
+        }
+      default:
+        jj_la1[99] = jj_gen;
+{if ("" != null) return new DescribeSymbol(-1, null);}
+      }
+    }
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol VerifyCommand() throws ParseException {KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
+    Token record;
+    TimestampSymbol timestamp = null;
+    jj_consume_token(VERIFY);
+    key = Key();
+    jj_consume_token(AS);
+    value = UnaryValue();
+    jj_consume_token(IN);
+    record = jj_consume_token(NUMERIC);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case AS_OF:
+    case TIMESTAMP:{
+      timestamp = TimestampReadCommand();
+      break;
+      }
+    default:
+      jj_la1[100] = jj_gen;
+      ;
+    }
+{if ("" != null) return new VerifySymbol(key, value, Long.parseLong(record.image), timestamp);}
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol SearchCommand() throws ParseException {KeyTokenSymbol<?> key;
+    Token query;
+    jj_consume_token(SEARCH);
+    key = Key();
+    jj_consume_token(FOR);
+    query = jj_consume_token(QUOTED_STRING);
+{if ("" != null) return new SearchSymbol(key, query.image);}
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol BrowseCommand() throws ParseException {Collection<KeyTokenSymbol<?>> keys;
+    TimestampSymbol timestamp = null;
+    jj_consume_token(BROWSE);
+    keys = KeyCollection();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case AS_OF:
+    case TIMESTAMP:{
+      timestamp = TimestampReadCommand();
+      break;
+      }
+    default:
+      jj_la1[101] = jj_gen;
+      ;
+    }
+{if ("" != null) return new BrowseSymbol(keys, timestamp);}
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol ChronologizeCommand() throws ParseException {KeyTokenSymbol<?> key;
+    Token record;
+    TimestampSymbol start = null;
+    TimestampSymbol end = null;
+    jj_consume_token(CHRONOLOGIZE);
+    key = Key();
+    jj_consume_token(IN);
+    record = jj_consume_token(NUMERIC);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case AS_OF:
+    case TIMESTAMP:{
+      start = TimestampReadCommand();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        end = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[102] = jj_gen;
+        ;
+      }
+      break;
+      }
+    default:
+      jj_la1[103] = jj_gen;
+      ;
+    }
+{if ("" != null) return new ChronologizeSymbol(key, Long.parseLong(record.image), start, end);}
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol DiffCommand() throws ParseException {KeyTokenSymbol<?> key = null;
+    Token record = null;
+    TimestampSymbol start;
+    TimestampSymbol end = null;
+    jj_consume_token(DIFF);
+    if (jj_2_33(2)) {
+      key = Key();
+      jj_consume_token(IN);
+    } else {
+      ;
+    }
+    if (jj_2_35(3)) {
+      record = jj_consume_token(NUMERIC);
+      start = TimestampReadCommand();
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        end = TimestampReadCommand();
+        break;
         }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new GetSymbol(keys, Long.parseLong(record.image), timestamp));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case OPEN_BRACKET:{
-          keys = KeyCollection();
-          jj_consume_token(FROM);
-          records = RecordCollection();
+      default:
+        jj_la1[104] = jj_gen;
+        ;
+      }
+{if ("" != null) return new DiffSymbol(key, Long.parseLong(record.image), start, end);}
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case RESERVED_IDENTIFIER:
+      case NUMERIC:
+      case SIGNED_INTEGER:
+      case SIGNED_DECIMAL:
+      case ALPHANUMERIC:
+      case PERIOD_SEPARATED_STRING:{
+        key = Key();
+        if (jj_2_34(3)) {
+          start = TimestampReadCommand();
+          end = TimestampReadCommand();
+{if ("" != null) return new DiffSymbol(key, -1, start, end);}
+        } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case IN:
           case AS_OF:
           case TIMESTAMP:{
-            timestamp = TimestampReadingCommand();
+            start = TimestampReadCommand();
+{if ("" != null) return new DiffSymbol(key, -1, start, null);}
             break;
             }
           default:
-            jj_la1[78] = jj_gen;
-            ;
-          }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new GetSymbol(keys, records, timestamp));
-          break;
+            jj_la1[105] = jj_gen;
+            jj_consume_token(-1);
+            throw new ParseException();
           }
-        default:
-          jj_la1[79] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
         }
+        break;
+        }
+      default:
+        jj_la1[106] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
+    }
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol InventoryCommand() throws ParseException {
+    jj_consume_token(INVENTORY);
+{if ("" != null) return InventorySymbol.INSTANCE;}
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol JsonifyCommand() throws ParseException {Token record = null;
+    Collection<Long> records = null;
+    TimestampSymbol timestamp = null;
+    boolean identifier = false;
+    jj_consume_token(JSONIFY);
+    if (jj_2_36(2)) {
+      record = jj_consume_token(NUMERIC);
+{if ("" != null) return new JsonifySymbol(Long.parseLong(record.image), identifier);}
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case OPEN_BRACKET:{
+        records = RecordCollection();
+{if ("" != null) return new JsonifySymbol(records, identifier);}
+        break;
+        }
+      default:
+        jj_la1[107] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case WITH:{
+      jj_consume_token(WITH);
+      jj_consume_token(RESERVED_IDENTIFIER);
+identifier = true;
+      break;
       }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+    default:
+      jj_la1[108] = jj_gen;
+      ;
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case AS_OF:
+    case TIMESTAMP:{
+      timestamp = TimestampReadCommand();
+      break;
       }
+    default:
+      jj_la1[109] = jj_gen;
+      ;
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void DescribeCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);Token record;
-    Collection records = null;
+  final public CommandSymbol NavigateCommand() throws ParseException {Collection<KeyTokenSymbol<?>> keys;
+    Token record = null;
+    Collection<Long> records = null;
     TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(DESCRIBE);
-      if (jj_2_23(2)) {
-        record = jj_consume_token(NUMERIC);
+    jj_consume_token(NAVIGATE);
+    keys = KeyCollection();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case FROM:
+    case WHERE:{
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case WHERE:{
+        jj_consume_token(WHERE);
+        DisjunctionExpression();
+{if ("" != null) return new NavigateSymbol(keys, (String)null, timestamp);}
+        break;
+        }
+      case FROM:{
+        jj_consume_token(FROM);
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case IN:
-        case AS_OF:
-        case TIMESTAMP:{
-          timestamp = TimestampReadingCommand();
+        case NUMERIC:{
+          record = jj_consume_token(NUMERIC);
+          switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+          case IN:
+          case AS_OF:
+          case TIMESTAMP:{
+            timestamp = TimestampReadCommand();
+            break;
+            }
+          default:
+            jj_la1[110] = jj_gen;
+            ;
+          }
+{if ("" != null) return new NavigateSymbol(keys, Long.parseLong(record.image), timestamp);}
           break;
           }
-        default:
-          jj_la1[80] = jj_gen;
-          ;
-        }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new DescribeSymbol(Long.parseLong(record.image), timestamp));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
         case OPEN_BRACKET:{
           records = RecordCollection();
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case IN:
           case AS_OF:
           case TIMESTAMP:{
-            timestamp = TimestampReadingCommand();
+            timestamp = TimestampReadCommand();
             break;
             }
           default:
-            jj_la1[81] = jj_gen;
+            jj_la1[111] = jj_gen;
             ;
           }
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new DescribeSymbol(records, timestamp));
+{if ("" != null) return new NavigateSymbol(keys, records, timestamp);}
           break;
           }
         default:
-          jj_la1[82] = jj_gen;
+          jj_la1[112] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
+        break;
+        }
+      default:
+        jj_la1[113] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
-      }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+      break;
       }
+    default:
+      jj_la1[114] = jj_gen;
+      ;
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void AuditCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
+  final public CommandSymbol ReconcileCommand() throws ParseException {KeyTokenSymbol<?> key;
     Token record;
-    try {
-      jj_consume_token(AUDIT);
-      if (jj_2_24(2)) {
-        key = Key();
-        jj_consume_token(FROM);
-        record = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new AuditSymbol(key, Long.parseLong(record.image)));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case NUMERIC:{
-          record = jj_consume_token(NUMERIC);
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new AuditSymbol(null, Long.parseLong(record.image)));
-          break;
-          }
-        default:
-          jj_la1[83] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
-        }
-      }
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
-      }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
-      }
-    }
+    Collection<ValueTokenSymbol<?>> values;
+    jj_consume_token(RECONCILE);
+    key = Key();
+    jj_consume_token(IN);
+    record = jj_consume_token(NUMERIC);
+    jj_consume_token(WITH);
+    values = ValueCollection();
+{if ("" != null) return new ReconcileSymbol(key, Long.parseLong(record.image), values);}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void VerifyCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
-    ValueTokenSymbol<?> value;
+  final public CommandSymbol ReviewCommand() throws ParseException {KeyTokenSymbol<?> key = null;
     Token record;
-    TimestampSymbol timestamp = null;
-    try {
-      jj_consume_token(VERIFY);
+    TimestampSymbol start = null;
+    TimestampSymbol end = null;
+    jj_consume_token(REVIEW);
+    if (jj_2_37(2)) {
       key = Key();
-      jj_consume_token(AS);
-      value = UnaryValue();
       jj_consume_token(IN);
-      record = jj_consume_token(NUMERIC);
+    } else {
+      ;
+    }
+    record = jj_consume_token(NUMERIC);
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case AS_OF:
+    case TIMESTAMP:{
+      start = TimestampReadCommand();
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case IN:
       case AS_OF:
       case TIMESTAMP:{
-        timestamp = TimestampReadingCommand();
-        break;
-        }
-      default:
-        jj_la1[84] = jj_gen;
-        ;
-      }
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(new VerifySymbol(key, value, Long.parseLong(record.image), timestamp));
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
-      }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
-      }
-    }
-}
-
-  final public void SearchCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key;
-    Token query;
-    try {
-      jj_consume_token(SEARCH);
-      key = Key();
-      jj_consume_token(FOR);
-      query = jj_consume_token(QUOTED_STRING);
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(new SearchSymbol(key, query.image));
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
+        end = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[115] = jj_gen;
+        ;
       }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
+      break;
       }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
+    default:
+      jj_la1[116] = jj_gen;
+      ;
+    }
+{if ("" != null) return new ReviewSymbol(key, Long.parseLong(record.image), start, end);}
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol TraceCommand() throws ParseException {Token record = null;
+    Collection<Long> records = null;
+    TimestampSymbol timestamp = null;
+    jj_consume_token(TRACE);
+    if (jj_2_38(2)) {
+      record = jj_consume_token(NUMERIC);
+{if ("" != null) return new TraceSymbol(Long.parseLong(record.image), timestamp);}
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case OPEN_BRACKET:{
+        records = RecordCollection();
+{if ("" != null) return new TraceSymbol(records, timestamp);}
+        break;
+        }
+      default:
+        jj_la1[117] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+    }
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case AS_OF:
+    case TIMESTAMP:{
+      timestamp = TimestampReadCommand();
+      break;
       }
+    default:
+      jj_la1[118] = jj_gen;
+      ;
     }
+    throw new Error("Missing return statement in function");
 }
 
-  final public void TransactionOperations() throws ParseException {
+// Transaction Operations
+  final public CommandSymbol TransactionOperations() throws ParseException {CommandSymbol cmd;
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
     case STAGE:{
-      StageCommand();
+      cmd = StageCommand();
       break;
       }
     case COMMIT:{
-      CommitCommand();
+      cmd = CommitCommand();
       break;
       }
     case ABORT:{
-      AbortCommand();
+      cmd = AbortCommand();
       break;
       }
     default:
-      jj_la1[85] = jj_gen;
+      jj_la1[119] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
+{if ("" != null) return cmd;}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void StageCommand() throws ParseException {/*@bgen(jjtree) Command */
-  ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
-    try {
-      jj_consume_token(STAGE);
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(StageSymbol.INSTANCE);
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
-      }
-    }
+  final public CommandSymbol StageCommand() throws ParseException {
+    jj_consume_token(STAGE);
+{if ("" != null) return StageSymbol.INSTANCE;}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void CommitCommand() throws ParseException {/*@bgen(jjtree) Command */
-  ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
-    try {
-      jj_consume_token(COMMIT);
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(CommitSymbol.INSTANCE);
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
-      }
-    }
+  final public CommandSymbol CommitCommand() throws ParseException {
+    jj_consume_token(COMMIT);
+{if ("" != null) return CommitSymbol.INSTANCE;}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void AbortCommand() throws ParseException {/*@bgen(jjtree) Command */
-  ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-  boolean jjtc000 = true;
-  jjtree.openNodeScope(jjtn000);
-    try {
-      jj_consume_token(ABORT);
-jjtree.closeNodeScope(jjtn000, true);
-      jjtc000 = false;
-jjtn000.command(AbortSymbol.INSTANCE);
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
-      }
-    }
+  final public CommandSymbol AbortCommand() throws ParseException {
+    jj_consume_token(ABORT);
+{if ("" != null) return AbortSymbol.INSTANCE;}
+    throw new Error("Missing return statement in function");
 }
 
-  final public void RevertCommand() throws ParseException {/*@bgen(jjtree) Command */
-    ASTCommand jjtn000 = new ASTCommand(JJTCOMMAND);
-    boolean jjtc000 = true;
-    jjtree.openNodeScope(jjtn000);KeyTokenSymbol<?> key = null;
+  final public CommandSymbol RevertCommand() throws ParseException {KeyTokenSymbol<?> key = null;
     Token record = null;
     Collection<KeyTokenSymbol<?>> keys = null;
     Collection<Long> records = null;
     TimestampSymbol timestamp;
-    try {
-      jj_consume_token(REVERT);
-      if (jj_2_25(3)) {
-        key = Key();
-        jj_consume_token(IN);
-        record = jj_consume_token(NUMERIC);
-        timestamp = TimestampReadingCommand();
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new RevertSymbol(key, Long.parseLong(record.image), timestamp));
-      } else if (jj_2_26(3)) {
-        key = Key();
-        jj_consume_token(IN);
-        records = RecordCollection();
-        timestamp = TimestampReadingCommand();
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new RevertSymbol(key, records, timestamp));
-      } else if (jj_2_27(3)) {
+    jj_consume_token(REVERT);
+    if (jj_2_39(3)) {
+      key = Key();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
+      timestamp = TimestampReadCommand();
+{if ("" != null) return new RevertSymbol(key, Long.parseLong(record.image), timestamp);}
+    } else if (jj_2_40(3)) {
+      key = Key();
+      jj_consume_token(IN);
+      records = RecordCollection();
+      timestamp = TimestampReadCommand();
+{if ("" != null) return new RevertSymbol(key, records, timestamp);}
+    } else if (jj_2_41(7)) {
+      keys = KeyCollection();
+      jj_consume_token(IN);
+      record = jj_consume_token(NUMERIC);
+      timestamp = TimestampReadCommand();
+{if ("" != null) return new RevertSymbol(keys, Long.parseLong(record.image), timestamp);}
+    } else {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case OPEN_BRACKET:{
         keys = KeyCollection();
         jj_consume_token(IN);
-        record = jj_consume_token(NUMERIC);
-        timestamp = TimestampReadingCommand();
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new RevertSymbol(keys, Long.parseLong(record.image), timestamp));
-      } else {
-        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-        case OPEN_BRACKET:{
-          keys = KeyCollection();
-          jj_consume_token(IN);
-          records = RecordCollection();
-          timestamp = TimestampReadingCommand();
-jjtree.closeNodeScope(jjtn000, true);
-          jjtc000 = false;
-jjtn000.command(new RevertSymbol(keys, records, timestamp));
-          break;
-          }
-        default:
-          jj_la1[86] = jj_gen;
-          jj_consume_token(-1);
-          throw new ParseException();
+        records = RecordCollection();
+        timestamp = TimestampReadCommand();
+{if ("" != null) return new RevertSymbol(keys, records, timestamp);}
+        break;
         }
-      }
-    } catch (Throwable jjte000) {
-if (jjtc000) {
-        jjtree.clearNodeScope(jjtn000);
-        jjtc000 = false;
-      } else {
-        jjtree.popNode();
-      }
-      if (jjte000 instanceof RuntimeException) {
-        {if (true) throw (RuntimeException)jjte000;}
-      }
-      if (jjte000 instanceof ParseException) {
-        {if (true) throw (ParseException)jjte000;}
-      }
-      {if (true) throw (Error)jjte000;}
-    } finally {
-if (jjtc000) {
-        jjtree.closeNodeScope(jjtn000, true);
+      default:
+        jj_la1[120] = jj_gen;
+        jj_consume_token(-1);
+        throw new ParseException();
       }
     }
+    throw new Error("Missing return statement in function");
 }
 
 // Utility parsing rules
+  final public Collection<ValueTokenSymbol<?>> ValueCollection() throws ParseException {ValueTokenSymbol<?> value;
+    Collection<ValueTokenSymbol<?>> values = Lists.newArrayList();
+    jj_consume_token(OPEN_BRACKET);
+    value = UnaryValue();
+values.add(value);
+    label_11:
+    while (true) {
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case COMMA:{
+        ;
+        break;
+        }
+      default:
+        jj_la1[121] = jj_gen;
+        break label_11;
+      }
+      jj_consume_token(COMMA);
+      value = UnaryValue();
+values.add(value);
+    }
+    jj_consume_token(CLOSE_BRACKET);
+{if ("" != null) return values;}
+    throw new Error("Missing return statement in function");
+}
+
   final public Collection RecordCollection() throws ParseException {Token record;
     Collection records = new ArrayList();
     jj_consume_token(OPEN_BRACKET);
     record = jj_consume_token(NUMERIC);
 records.add(Long.parseLong(record.image));
-    label_11:
+    label_12:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -2907,8 +3083,8 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[87] = jj_gen;
-        break label_11;
+        jj_la1[122] = jj_gen;
+        break label_12;
       }
       jj_consume_token(COMMA);
       record = jj_consume_token(NUMERIC);
@@ -2924,7 +3100,7 @@ record = jj_consume_token(NUMERIC);
     jj_consume_token(OPEN_BRACKET);
     key = Key();
 keys.add(key.toString());
-    label_12:
+    label_13:
     while (true) {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case COMMA:{
@@ -2932,8 +3108,8 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[88] = jj_gen;
-        break label_12;
+        jj_la1[123] = jj_gen;
+        break label_13;
       }
       jj_consume_token(COMMA);
       key = Key();
@@ -3097,418 +3273,736 @@ private boolean jj_2_18(int xla)
   private boolean jj_2_19(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_19()); }
+    try { return (!jj_3_19()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(18, xla); }
+  }
+
+  private boolean jj_2_20(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_20()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(19, xla); }
+  }
+
+  private boolean jj_2_21(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_21()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(20, xla); }
+  }
+
+  private boolean jj_2_22(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_22()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(21, xla); }
+  }
+
+  private boolean jj_2_23(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_23()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(22, xla); }
+  }
+
+  private boolean jj_2_24(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_24()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(23, xla); }
+  }
+
+  private boolean jj_2_25(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_25()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(24, xla); }
+  }
+
+  private boolean jj_2_26(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_26()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(25, xla); }
+  }
+
+  private boolean jj_2_27(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_27()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(26, xla); }
+  }
+
+  private boolean jj_2_28(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_28()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(27, xla); }
+  }
+
+  private boolean jj_2_29(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_29()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(28, xla); }
+  }
+
+  private boolean jj_2_30(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_30()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(29, xla); }
+  }
+
+  private boolean jj_2_31(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_31()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(30, xla); }
+  }
+
+  private boolean jj_2_32(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_32()); }
+    catch(LookaheadSuccess ls) { return true; }
+    finally { jj_save(31, xla); }
+  }
+
+  private boolean jj_2_33(int xla)
+ {
+    jj_la = xla; jj_lastpos = jj_scanpos = token;
+    try { return (!jj_3_33()); }
     catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(18, xla); }
+    finally { jj_save(32, xla); }
   }
 
-  private boolean jj_2_20(int xla)
+  private boolean jj_2_34(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_20()); }
+    try { return (!jj_3_34()); }
     catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(19, xla); }
+    finally { jj_save(33, xla); }
   }
 
-  private boolean jj_2_21(int xla)
+  private boolean jj_2_35(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_21()); }
+    try { return (!jj_3_35()); }
     catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(20, xla); }
+    finally { jj_save(34, xla); }
   }
 
-  private boolean jj_2_22(int xla)
+  private boolean jj_2_36(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_22()); }
+    try { return (!jj_3_36()); }
     catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(21, xla); }
+    finally { jj_save(35, xla); }
   }
 
-  private boolean jj_2_23(int xla)
+  private boolean jj_2_37(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_23()); }
+    try { return (!jj_3_37()); }
     catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(22, xla); }
+    finally { jj_save(36, xla); }
   }
 
-  private boolean jj_2_24(int xla)
+  private boolean jj_2_38(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_24()); }
+    try { return (!jj_3_38()); }
     catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(23, xla); }
+    finally { jj_save(37, xla); }
   }
 
-  private boolean jj_2_25(int xla)
+  private boolean jj_2_39(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_25()); }
+    try { return (!jj_3_39()); }
     catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(24, xla); }
+    finally { jj_save(38, xla); }
   }
 
-  private boolean jj_2_26(int xla)
+  private boolean jj_2_40(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_26()); }
+    try { return (!jj_3_40()); }
     catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(25, xla); }
+    finally { jj_save(39, xla); }
   }
 
-  private boolean jj_2_27(int xla)
+  private boolean jj_2_41(int xla)
  {
     jj_la = xla; jj_lastpos = jj_scanpos = token;
-    try { return (!jj_3_27()); }
+    try { return (!jj_3_41()); }
     catch(LookaheadSuccess ls) { return true; }
-    finally { jj_save(26, xla); }
+    finally { jj_save(40, xla); }
   }
 
-  private boolean jj_3_4()
+  private boolean jj_3R_43()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(49)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
+    if (jj_scan_token(80)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(74)) {
+    if (jj_scan_token(77)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
+    if (jj_scan_token(81)) return true;
     }
     }
     }
     }
+    return false;
+  }
+
+  private boolean jj_3_7()
+ {
+    if (jj_3R_20()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_27()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_7()) {
+    jj_scanpos = xsp;
+    if (jj_3R_43()) {
+    jj_scanpos = xsp;
+    if (jj_3R_44()) return true;
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_64()
+  private boolean jj_3R_19()
  {
     Token xsp;
-    if (jj_3_4()) return true;
+    xsp = jj_scanpos;
+    if (jj_scan_token(47)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(32)) return true;
+    }
+    if (jj_3_13()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3_4()) { jj_scanpos = xsp; break; }
+      if (jj_3_13()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_40()
+  private boolean jj_3_32()
  {
-    if (jj_3R_44()) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_36()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_57()
+  private boolean jj_3R_25()
+ {
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_24()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_5()) {
-    jj_scanpos = xsp;
-    if (jj_3R_64()) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_3R_65()) return true;
-    }
+    if (jj_scan_token(77)) return true;
     }
     return false;
   }
 
-  private boolean jj_3_5()
+  private boolean jj_3R_77()
  {
-    if (jj_3R_19()) return true;
+    if (jj_scan_token(BINARY_OPERATOR)) return true;
     return false;
   }
 
-  private boolean jj_3R_39()
+  private boolean jj_3R_67()
  {
-    if (jj_3R_43()) return true;
+    if (jj_3R_77()) return true;
+    if (jj_3R_78()) return true;
+    if (jj_3R_78()) return true;
     return false;
   }
 
-  private boolean jj_3_9()
+  private boolean jj_3R_66()
  {
+    if (jj_3R_75()) return true;
+    if (jj_3R_76()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(65)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_3_5()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_65()
+ {
+    if (jj_3R_73()) return true;
+    if (jj_3R_74()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_4()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_29()
+ {
+    if (jj_3R_14()) return true;
+    return false;
+  }
+
+  private boolean jj_3_17()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(80)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(74)) return true;
-    }
+    if (jj_scan_token(82)) return true;
     }
     }
     }
+    if (jj_scan_token(COMMA)) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_24()) {
+    jj_scanpos = xsp;
+    if (jj_3R_25()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_31()
+  private boolean jj_3R_23()
+ {
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_19()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_64()
+ {
+    if (jj_3R_71()) return true;
+    if (jj_3R_72()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_3()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_75()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_39()) {
+    if (jj_scan_token(52)) {
     jj_scanpos = xsp;
-    if (jj_3R_40()) return true;
+    if (jj_scan_token(54)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(55)) return true;
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_34()
+  private boolean jj_3R_22()
  {
-    if (jj_scan_token(PERIOD_SEPARATED_STRING)) return true;
+    if (jj_scan_token(CLOSE_PARENTHESES)) return true;
     return false;
   }
 
-  private boolean jj_3R_36()
+  private boolean jj_3R_18()
+ {
+    if (jj_3R_41()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_47()
+ {
+    if (jj_scan_token(CONJUNCTION)) return true;
+    return false;
+  }
+
+  private boolean jj_3_38()
+ {
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_39()
+ {
+    if (jj_scan_token(DISJUNCTION)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_61()
  {
+    if (jj_3R_27()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(38)) {
+    if (jj_3R_64()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(23)) {
+    if (jj_3R_65()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(27)) return true;
+    if (jj_3R_66()) {
+    jj_scanpos = xsp;
+    if (jj_3R_67()) return true;
+    }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_33()
+  private boolean jj_3R_73()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(40)) {
+    if (jj_scan_token(63)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(64)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(65)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(66)) return true;
+    }
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3_16()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_scan_token(80)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) return true;
+    if (jj_scan_token(82)) return true;
     }
     }
     }
+    xsp = jj_scanpos;
+    if (jj_3R_22()) {
+    jj_scanpos = xsp;
+    if (jj_3R_23()) return true;
     }
     return false;
   }
 
-  private boolean jj_3_3()
+  private boolean jj_3_31()
+ {
+    if (jj_3R_28()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_17()
+ {
+    if (jj_3R_40()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_21()
+ {
+    if (jj_scan_token(ALPHANUMERIC)) return true;
+    if (jj_scan_token(OPEN_PARENTHESES)) return true;
+    return false;
+  }
+
+  private boolean jj_3_30()
+ {
+    if (jj_3R_28()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_33()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_34()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_35()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_71()
+ {
+    if (jj_scan_token(LINKS_TO)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_52()
+ {
+    if (jj_scan_token(OPEN_PARENTHESES)) return true;
+    if (jj_3R_14()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_46()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_52()) {
+    jj_scanpos = xsp;
+    if (jj_3R_53()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_16()
+ {
+    if (jj_3R_41()) return true;
+    return false;
+  }
+
+  private boolean jj_3_29()
+ {
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_3R_26()) return true;
+    return false;
+  }
+
+  private boolean jj_3_37()
+ {
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(IN)) return true;
+    return false;
+  }
+
+  private boolean jj_3_28()
+ {
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_87()
  {
-    if (jj_3R_18()) return true;
+    if (jj_scan_token(QUOTED_STRING)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_38()
+ {
+    if (jj_3R_46()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_47()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_24()
+  private boolean jj_3R_20()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3_3()) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_3R_33()) {
+    if (jj_scan_token(80)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(77)) {
     jj_scanpos = xsp;
-    if (jj_3R_34()) return true;
+    if (jj_scan_token(81)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(82)) return true;
+    }
     }
     }
+    }
+    if (jj_scan_token(PIPE)) return true;
+    if (jj_scan_token(ALPHANUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_32()
+  private boolean jj_3_27()
  {
+    if (jj_3R_28()) return true;
+    if (jj_scan_token(WHERE)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(38)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(23)) return true;
-    }
+    if (jj_3R_29()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_30()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_31()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_32()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_23()
+  private boolean jj_3R_15()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  private boolean jj_3R_22()
+  private boolean jj_3R_14()
  {
+    if (jj_3R_38()) return true;
     Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(68)) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_39()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3_24()
+  private boolean jj_3_23()
  {
-    if (jj_3R_24()) return true;
+    if (jj_3R_28()) return true;
     if (jj_scan_token(FROM)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_59()
+  private boolean jj_3_15()
  {
-    if (jj_scan_token(BINARY_OPERATOR)) return true;
+    if (jj_3R_20()) return true;
     return false;
   }
 
-  private boolean jj_3R_49()
+  private boolean jj_3_22()
  {
-    if (jj_3R_59()) return true;
-    if (jj_3R_60()) return true;
-    if (jj_3R_60()) return true;
+    if (jj_3R_28()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_27()
+  private boolean jj_3_21()
  {
-    if (jj_3R_36()) return true;
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_48()
+  private boolean jj_3R_80()
  {
-    if (jj_3R_56()) return true;
-    if (jj_3R_57()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_58()) jj_scanpos = xsp;
+    if (jj_scan_token(DESC)) return true;
     return false;
   }
 
-  private boolean jj_3R_47()
+  private boolean jj_3_2()
  {
-    if (jj_3R_53()) return true;
-    if (jj_3R_54()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_55()) jj_scanpos = xsp;
+    if (jj_scan_token(48)) jj_scanpos = xsp;
+    if (jj_3R_14()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_17()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_18()) jj_scanpos = xsp;
+    if (jj_scan_token(0)) return true;
     return false;
   }
 
-  private boolean jj_3_13()
+  private boolean jj_3R_79()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
-    }
-    }
-    }
-    if (jj_scan_token(COMMA)) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_22()) {
-    jj_scanpos = xsp;
-    if (jj_3R_23()) return true;
-    }
+    if (jj_scan_token(ASC)) return true;
     return false;
   }
 
-  private boolean jj_3R_21()
+  private boolean jj_3_20()
  {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_32()) return true;
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_46()
+  private boolean jj_3_26()
  {
-    if (jj_3R_50()) return true;
-    if (jj_3R_51()) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_52()) jj_scanpos = xsp;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_56()
+  private boolean jj_3R_86()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(43)) {
+    if (jj_scan_token(79)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(45)) {
+    if (jj_scan_token(77)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(46)) return true;
+    if (jj_scan_token(81)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(83)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(82)) return true;
+    }
+    }
+    }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_20()
- {
-    if (jj_scan_token(CLOSE_PARENTHESES)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_17()
- {
-    if (jj_3R_31()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_38()
- {
-    if (jj_scan_token(CONJUNCTION)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_29()
+  private boolean jj_3_19()
  {
-    if (jj_scan_token(DISJUNCTION)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_45()
+  private boolean jj_3R_70()
  {
-    if (jj_3R_24()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_46()) {
-    jj_scanpos = xsp;
-    if (jj_3R_47()) {
+    if (jj_3R_79()) {
     jj_scanpos = xsp;
-    if (jj_3R_48()) {
-    jj_scanpos = xsp;
-    if (jj_3R_49()) return true;
-    }
-    }
+    if (jj_3R_80()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_53()
+  private boolean jj_3_25()
+ {
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_78()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(54)) {
+    if (jj_3_12()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(55)) {
+    if (jj_3R_86()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(56)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(57)) return true;
-    }
+    if (jj_3R_87()) return true;
     }
     }
     return false;
@@ -3516,321 +4010,358 @@ private boolean jj_3R_53()
 
   private boolean jj_3_12()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
-    }
-    }
-    }
-    xsp = jj_scanpos;
-    if (jj_3R_20()) {
-    jj_scanpos = xsp;
     if (jj_3R_21()) return true;
-    }
     return false;
   }
 
-  private boolean jj_3R_16()
+  private boolean jj_3_18()
  {
-    if (jj_3R_30()) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_23()
+  private boolean jj_3R_69()
  {
-    if (jj_scan_token(NUMERIC)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_27()) jj_scanpos = xsp;
+    if (jj_scan_token(CLOSE_ANGLE_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_19()
+  private boolean jj_3R_68()
  {
-    if (jj_scan_token(ALPHANUMERIC)) return true;
-    if (jj_scan_token(OPEN_PARENTHESES)) return true;
+    if (jj_scan_token(OPEN_ANGLE_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_50()
+  private boolean jj_3_24()
  {
-    if (jj_scan_token(LINKS_TO)) return true;
+    if (jj_3R_28()) return true;
     return false;
   }
 
-  private boolean jj_3R_37()
+  private boolean jj_3_1()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_41()) {
-    jj_scanpos = xsp;
-    if (jj_3R_42()) return true;
-    }
+    if (jj_scan_token(48)) jj_scanpos = xsp;
+    if (jj_3R_14()) return true;
+    xsp = jj_scanpos;
+    if (jj_3R_15()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_16()) jj_scanpos = xsp;
+    if (jj_scan_token(88)) return true;
     return false;
   }
 
-  private boolean jj_3R_41()
+  private boolean jj_3R_83()
  {
-    if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    if (jj_3R_13()) return true;
+    if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_15()
+  private boolean jj_3R_62()
  {
-    if (jj_3R_31()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_68()) {
+    jj_scanpos = xsp;
+    if (jj_3R_69()) return true;
+    }
     return false;
   }
 
-  private boolean jj_3R_67()
+  private boolean jj_3_36()
  {
-    if (jj_scan_token(QUOTED_STRING)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_28()
+  private boolean jj_3_10()
  {
-    if (jj_3R_37()) return true;
     Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_38()) { jj_scanpos = xsp; break; }
+    xsp = jj_scanpos;
+    if (jj_scan_token(79)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(77)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(81)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(83)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(82)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(89)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(90)) return true;
+    }
+    }
+    }
+    }
+    }
+    }
     }
     return false;
   }
 
-  private boolean jj_3R_18()
+  private boolean jj_3_11()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(79)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(77)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
+    if (jj_scan_token(89)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(90)) return true;
+    }
+    }
+    }
     }
     }
     }
     }
-    if (jj_scan_token(PIPE)) return true;
-    if (jj_scan_token(ALPHANUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_14()
+  private boolean jj_3R_82()
  {
-    if (jj_3R_30()) return true;
+    Token xsp;
+    if (jj_3_11()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_11()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_13()
+  private boolean jj_3R_45()
  {
-    if (jj_3R_28()) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_27()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_63()
+ {
+    if (jj_3R_70()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_28()
+ {
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_27()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_29()) { jj_scanpos = xsp; break; }
+      if (jj_3R_45()) { jj_scanpos = xsp; break; }
     }
+    if (jj_scan_token(CLOSE_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3_22()
+  private boolean jj_3_34()
  {
-    if (jj_3R_26()) return true;
+    if (jj_3R_37()) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  private boolean jj_3_11()
+  private boolean jj_3R_58()
  {
-    if (jj_3R_18()) return true;
+    if (jj_3R_19()) return true;
     return false;
   }
 
-  private boolean jj_3_21()
+  private boolean jj_3R_81()
  {
-    if (jj_3R_24()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_3R_25()) return true;
+    if (jj_scan_token(OPEN_PARENTHESES)) return true;
+    Token xsp;
+    if (jj_3_10()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_10()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3_20()
+  private boolean jj_3R_74()
  {
-    if (jj_3R_24()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_81()) {
+    jj_scanpos = xsp;
+    if (jj_3R_82()) {
+    jj_scanpos = xsp;
+    if (jj_3R_83()) return true;
+    }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_57()
+ {
+    if (jj_3R_27()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_63()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_35()
+  private boolean jj_3R_42()
  {
     if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3_2()
+  private boolean jj_3R_56()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(39)) jj_scanpos = xsp;
-    if (jj_3R_13()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_16()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_17()) jj_scanpos = xsp;
-    if (jj_scan_token(0)) return true;
+    if (jj_3R_62()) return true;
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_66()
+  private boolean jj_3R_50()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
+    if (jj_3R_56()) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(74)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) return true;
-    }
-    }
-    }
-    }
+    if (jj_3R_57()) return true;
     }
+    xsp = jj_scanpos;
+    if (jj_3R_58()) jj_scanpos = xsp;
     return false;
   }
 
   private boolean jj_3R_26()
  {
     if (jj_scan_token(OPEN_BRACKET)) return true;
-    if (jj_3R_24()) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_35()) { jj_scanpos = xsp; break; }
+      if (jj_3R_42()) { jj_scanpos = xsp; break; }
     }
     if (jj_scan_token(CLOSE_BRACKET)) return true;
     return false;
   }
 
-  private boolean jj_3R_60()
+  private boolean jj_3_35()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3_8()) {
-    jj_scanpos = xsp;
-    if (jj_3R_66()) {
-    jj_scanpos = xsp;
-    if (jj_3R_67()) return true;
-    }
-    }
+    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  private boolean jj_3_8()
+  private boolean jj_3_33()
  {
-    if (jj_3R_19()) return true;
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(IN)) return true;
     return false;
   }
 
-  private boolean jj_3_16()
+  private boolean jj_3R_72()
  {
-    if (jj_3R_26()) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_1()
+  private boolean jj_3R_51()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(39)) jj_scanpos = xsp;
-    if (jj_3R_13()) return true;
-    xsp = jj_scanpos;
-    if (jj_3R_14()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_15()) jj_scanpos = xsp;
-    if (jj_scan_token(79)) return true;
+    if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3R_25()
+  private boolean jj_3R_35()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_41()) return true;
     return false;
   }
 
-  private boolean jj_3_15()
+  private boolean jj_3R_32()
  {
-    if (jj_3R_24()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_3R_25()) return true;
+    if (jj_3R_41()) return true;
     return false;
   }
 
-  private boolean jj_3R_63()
+  private boolean jj_3_6()
+ {
+    if (jj_3R_19()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_40()
+ {
+    if (jj_scan_token(ORDER)) return true;
+    if (jj_3R_50()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_51()) { jj_scanpos = xsp; break; }
+    }
+    return false;
+  }
+
+  private boolean jj_3R_85()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3_19()
+  private boolean jj_3R_34()
  {
-    if (jj_3R_26()) return true;
+    if (jj_3R_40()) return true;
     return false;
   }
 
-  private boolean jj_3_14()
+  private boolean jj_3R_31()
  {
-    if (jj_3R_24()) return true;
-    if (jj_scan_token(FROM)) return true;
+    if (jj_3R_40()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_55()
+ {
+    if (jj_scan_token(SIZE)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_18()
+  private boolean jj_3_41()
  {
-    if (jj_3R_24()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_3R_25()) return true;
+    if (jj_3R_28()) return true;
+    if (jj_scan_token(IN)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  private boolean jj_3_6()
+  private boolean jj_3_14()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(74)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
     if (jj_scan_token(80)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) return true;
-    }
-    }
+    if (jj_scan_token(77)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(81)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(83)) return true;
     }
     }
     }
@@ -3839,141 +4370,152 @@ private boolean jj_3_6()
     return false;
   }
 
-  private boolean jj_3_7()
+  private boolean jj_3R_59()
  {
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_scan_token(70)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(74)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(73)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(81)) return true;
-    }
-    }
-    }
-    }
-    }
-    }
-    }
+    if (jj_3R_55()) return true;
     return false;
   }
 
-  private boolean jj_3_17()
+  private boolean jj_3_40()
  {
-    if (jj_3R_24()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(IN)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_62()
+  private boolean jj_3R_60()
  {
-    Token xsp;
-    if (jj_3_7()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_7()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_54()) return true;
     return false;
   }
 
-  private boolean jj_3_27()
+  private boolean jj_3_4()
  {
-    if (jj_3R_26()) return true;
+    if (jj_3R_19()) return true;
     return false;
   }
 
-  private boolean jj_3_26()
+  private boolean jj_3R_53()
  {
-    if (jj_3R_24()) return true;
-    if (jj_scan_token(IN)) return true;
-    if (jj_3R_25()) return true;
+    if (jj_3R_61()) return true;
     return false;
   }
 
-  private boolean jj_3R_61()
+  private boolean jj_3_5()
  {
-    if (jj_scan_token(OPEN_PARENTHESES)) return true;
-    Token xsp;
-    if (jj_3_6()) return true;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3_6()) { jj_scanpos = xsp; break; }
-    }
+    if (jj_3R_19()) return true;
+    return false;
+  }
+
+  private boolean jj_3_3()
+ {
+    if (jj_3R_19()) return true;
+    return false;
+  }
+
+  private boolean jj_3_39()
+ {
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(IN)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
   private boolean jj_3R_54()
+ {
+    if (jj_scan_token(PAGE)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
+  private boolean jj_3_8()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_61()) {
+    if (jj_scan_token(79)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(80)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(77)) {
     jj_scanpos = xsp;
-    if (jj_3R_62()) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_3R_63()) return true;
+    if (jj_scan_token(83)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(82)) return true;
+    }
+    }
+    }
     }
     }
     return false;
   }
 
-  private boolean jj_3_25()
+  private boolean jj_3R_84()
  {
-    if (jj_3R_24()) return true;
-    if (jj_scan_token(IN)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
+    Token xsp;
+    if (jj_3_8()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_8()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
-  private boolean jj_3R_51()
+  private boolean jj_3R_49()
  {
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_3R_55()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_60()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_30()
+  private boolean jj_3R_76()
  {
-    if (jj_scan_token(ORDER)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3_9()) {
+    jj_scanpos = xsp;
+    if (jj_3R_84()) {
+    jj_scanpos = xsp;
+    if (jj_3R_85()) return true;
+    }
+    }
     return false;
   }
 
-  private boolean jj_3R_65()
+  private boolean jj_3_9()
  {
-    if (jj_scan_token(QUOTED_STRING)) return true;
+    if (jj_3R_21()) return true;
     return false;
   }
 
-  private boolean jj_3R_44()
+  private boolean jj_3R_48()
  {
-    if (jj_scan_token(SIZE)) return true;
+    if (jj_3R_54()) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_59()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3_10()
+  private boolean jj_3_13()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(65)) {
+    if (jj_scan_token(74)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(70)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(71)) {
+    if (jj_scan_token(80)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(68)) {
+    if (jj_scan_token(77)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(72)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(74)) return true;
+    if (jj_scan_token(83)) return true;
     }
     }
     }
@@ -3982,33 +4524,57 @@ private boolean jj_3_10()
     return false;
   }
 
-  private boolean jj_3R_55()
+  private boolean jj_3R_41()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_48()) {
+    jj_scanpos = xsp;
+    if (jj_3R_49()) return true;
+    }
+    return false;
+  }
+
+  private boolean jj_3R_36()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  private boolean jj_3R_58()
+  private boolean jj_3R_33()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  private boolean jj_3R_52()
+  private boolean jj_3R_30()
  {
-    if (jj_3R_32()) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  private boolean jj_3R_42()
+  private boolean jj_3R_44()
  {
-    if (jj_3R_45()) return true;
+    if (jj_scan_token(PERIOD_SEPARATED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_43()
+  private boolean jj_3R_37()
  {
-    if (jj_scan_token(PAGE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(47)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(32)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(36)) return true;
+    }
+    }
+    if (jj_3_14()) return true;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3_14()) { jj_scanpos = xsp; break; }
+    }
     return false;
   }
 
@@ -4023,7 +4589,7 @@ private boolean jj_3R_43()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[89];
+  final private int[] jj_la1 = new int[124];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -4033,15 +4599,15 @@ private boolean jj_3R_43()
 	   jj_la1_init_2();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x0,0x0,0x0,0x7ffff8,0x0,0x0,0x0,0x0,0x7ffff8,0x0,0x0,0x0,0x0,0x800000,0x800000,0x800000,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x8800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x800000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7ffff8,0x1f8,0x10000000,0x2800000,0x0,0x1800000,0x0,0x1800000,0xc00,0x0,0x0,0x7f000,0x8800000,0x8800000,0x8800000,0x8800000,0x8800000,0x0,0x8800000,0x8800000,0x8800000,0x8800000,0x0,0x8800000,0x8800000,0x0,0x0,0x8800000,0x380000,0x0,0x0,0x0,};
+	   jj_la1_0 = new int[] {0x0,0x0,0x0,0xf7fffff8,0x0,0x0,0x0,0x0,0xf7fffff8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf7fffff8,0x1f8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc00,0x0,0x0,0x7fff000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x70000000,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x80,0x20000000,0x18000000,0x0,0x38000000,0x80,0x20000000,0x18000000,0x0,0x38000000,0x400,0x200,0x104,0x40,0x40,0x40,0x40,0x3e07800,0x100,0x100,0x0,0x0,0x0,0x0,0x4,0x0,0x0,0x3c00000,0x6800,0x40,0x0,0x40,0x0,0x10000000,0x8000000,0x18000000,0x0,0xc0000000,0x6100,0x40,0x6000,0xc0000000,0x0,0x0,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x8,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x10,0x0,0x0,0x10,0x10,0x0,0x40,0x40,0x40,0x40,0x40,0x10,0x40,0x40,0x40,0x40,0x10,0x40,0x40,0x10,0x0,0x40,0x0,0x10,0x0,0x0,};
+	   jj_la1_1 = new int[] {0x10000,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x0,0x0,0x80000,0x40000,0x20800,0xc0f00000,0x20000,0x20000,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x80000000,0xd00000,0x8001,0x0,0x8011,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x8001,0xc00000,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x1000,0x0,0x0,0x0,0x2000,0x1,0x20,0x5,0x2000,0x3,0x2000,0x3,0x0,0x2000,0x2000,0x0,0x20000,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x10000,0x20800,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x8011,0x2000,0x8011,0x8011,0x8011,0x8011,0x8011,0x8011,0x20000,0x2000,0x80,0x8011,0x8011,0x8011,0x2000,0x10004,0x10004,0x8011,0x8011,0x2000,0x8011,0x0,0x2000,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x0,0x0,0x0,0x3d0,0x0,0x0,0x0,0x0,0x3d0,0x0,0x0,0x3d0,0x0,0x0,0x0,0x0,0x0,0x1d0,0x3d0,0x7d0,0x7d2,0x307d0,0x307d0,0x307d2,0x7d0,0x7d2,0x0,0x0,0x0,0x5d2,0x0,0x5d2,0x0,0x0,0x0,0x20,0x0,0x3d0,0x0,0x0,0x0,0x100,0x3d0,0x3c0,0x20,0x3c0,0x50,0x20,0x50,0x50,0x20,0x50,0x50,0x3c0,0x20,0x3c0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x10,0x10,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10,0x0,0x0,0x0,0x20,0x20,};
+	   jj_la1_2 = new int[] {0x0,0x40,0x30,0x0,0x7a070,0x0,0x40,0x30,0x0,0x7a070,0x0,0x0,0x7a000,0x7,0x3a000,0x7a000,0xfa000,0xfa400,0x60fa000,0x60fa000,0x60fa400,0xfa000,0xfa400,0x7,0x0,0x0,0xba400,0x0,0xba400,0x20,0x10,0x30,0x4000,0x180,0x7a000,0x0,0x0,0x180,0x20000,0x7a000,0x78000,0x4000,0x78000,0xa000,0x4000,0xa000,0xa000,0x4000,0xa000,0xa000,0x78000,0x4000,0x78000,0x0,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x2000,0x2000,0x0,0x7a000,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x7a000,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7a000,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x4000,};
 	}
-  final private JJCalls[] jj_2_rtns = new JJCalls[27];
+  final private JJCalls[] jj_2_rtns = new JJCalls[41];
   private boolean jj_rescan = false;
   private int jj_gc = 0;
 
@@ -4056,7 +4622,7 @@ public Grammar(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4072,7 +4638,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4083,7 +4649,7 @@ public Grammar(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4103,7 +4669,7 @@ public void ReInit(java.io.Reader stream) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4113,7 +4679,7 @@ public Grammar(GrammarTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4124,7 +4690,7 @@ public void ReInit(GrammarTokenManager tm) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 89; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4250,12 +4816,12 @@ private void jj_add_error_token(int kind, int pos) {
   /** Generate ParseException. */
   public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[82];
+	 boolean[] la1tokens = new boolean[91];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 89; i++) {
+	 for (int i = 0; i < 124; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4270,7 +4836,7 @@ public ParseException generateParseException() {
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 82; i++) {
+	 for (int i = 0; i < 91; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
@@ -4305,7 +4871,7 @@ final public void disable_tracing() {
 
   private void jj_rescan_token() {
 	 jj_rescan = true;
-	 for (int i = 0; i < 27; i++) {
+	 for (int i = 0; i < 41; i++) {
 	   try {
 		 JJCalls p = jj_2_rtns[i];
 
@@ -4340,6 +4906,20 @@ private void jj_rescan_token() {
 			   case 24: jj_3_25(); break;
 			   case 25: jj_3_26(); break;
 			   case 26: jj_3_27(); break;
+			   case 27: jj_3_28(); break;
+			   case 28: jj_3_29(); break;
+			   case 29: jj_3_30(); break;
+			   case 30: jj_3_31(); break;
+			   case 31: jj_3_32(); break;
+			   case 32: jj_3_33(); break;
+			   case 33: jj_3_34(); break;
+			   case 34: jj_3_35(); break;
+			   case 35: jj_3_36(); break;
+			   case 36: jj_3_37(); break;
+			   case 37: jj_3_38(); break;
+			   case 38: jj_3_39(); break;
+			   case 39: jj_3_40(); break;
+			   case 40: jj_3_41(); break;
 			 }
 		   }
 		   p = p.next;
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
index 4d3eabd6..1b818dea 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
@@ -31,137 +31,155 @@ public interface GrammarConstants {
   /** RegularExpression Id. */
   int SELECT = 12;
   /** RegularExpression Id. */
-  int FETCH = 13;
+  int GET = 13;
   /** RegularExpression Id. */
-  int GET = 14;
+  int FIND = 14;
   /** RegularExpression Id. */
   int DESCRIBE = 15;
   /** RegularExpression Id. */
-  int AUDIT = 16;
+  int VERIFY = 16;
   /** RegularExpression Id. */
-  int VERIFY = 17;
+  int SEARCH = 17;
   /** RegularExpression Id. */
-  int SEARCH = 18;
+  int BROWSE = 18;
   /** RegularExpression Id. */
-  int STAGE = 19;
+  int CHRONOLOGIZE = 19;
   /** RegularExpression Id. */
-  int COMMIT = 20;
+  int DIFF = 20;
   /** RegularExpression Id. */
-  int ABORT = 21;
+  int INVENTORY = 21;
   /** RegularExpression Id. */
-  int REVERT = 22;
+  int JSONIFY = 22;
   /** RegularExpression Id. */
-  int IN = 23;
+  int NAVIGATE = 23;
   /** RegularExpression Id. */
-  int INTO = 24;
+  int RECONCILE = 24;
   /** RegularExpression Id. */
-  int FROM = 25;
+  int REVIEW = 25;
   /** RegularExpression Id. */
-  int TO = 26;
+  int TRACE = 26;
   /** RegularExpression Id. */
-  int AS_OF = 27;
+  int CALCULATE = 27;
   /** RegularExpression Id. */
-  int AS = 28;
+  int STAGE = 28;
   /** RegularExpression Id. */
-  int FOR = 29;
+  int COMMIT = 29;
   /** RegularExpression Id. */
-  int WITH = 30;
+  int ABORT = 30;
   /** RegularExpression Id. */
-  int OPEN_BRACE = 31;
+  int REVERT = 31;
   /** RegularExpression Id. */
-  int CLOSE_BRACE = 32;
+  int IN = 32;
   /** RegularExpression Id. */
-  int COLON = 33;
+  int INTO = 33;
   /** RegularExpression Id. */
-  int OPEN_PARENTHESES = 34;
+  int FROM = 34;
   /** RegularExpression Id. */
-  int CLOSE_PARENTHESES = 35;
+  int TO = 35;
   /** RegularExpression Id. */
-  int OPEN_BRACKET = 36;
+  int AS_OF = 36;
   /** RegularExpression Id. */
-  int CLOSE_BRACKET = 37;
+  int AS = 37;
   /** RegularExpression Id. */
-  int TIMESTAMP = 38;
+  int FOR = 38;
   /** RegularExpression Id. */
-  int WHERE = 39;
+  int WITH = 39;
   /** RegularExpression Id. */
-  int RESERVED_IDENTIFIER = 40;
+  int OPEN_BRACE = 40;
   /** RegularExpression Id. */
-  int CONJUNCTION = 41;
+  int CLOSE_BRACE = 41;
   /** RegularExpression Id. */
-  int DISJUNCTION = 42;
+  int COLON = 42;
   /** RegularExpression Id. */
-  int UNARY_OPERATOR = 43;
+  int OPEN_PARENTHESES = 43;
   /** RegularExpression Id. */
-  int BINARY_OPERATOR = 44;
+  int CLOSE_PARENTHESES = 44;
   /** RegularExpression Id. */
-  int OPEN_ANGLE_BRACKET = 45;
+  int OPEN_BRACKET = 45;
   /** RegularExpression Id. */
-  int CLOSE_ANGLE_BRACKET = 46;
+  int CLOSE_BRACKET = 46;
   /** RegularExpression Id. */
-  int EQUALS = 47;
+  int TIMESTAMP = 47;
   /** RegularExpression Id. */
-  int NOT_EQUALS = 48;
+  int WHERE = 48;
   /** RegularExpression Id. */
-  int GREATER_THAN = 49;
+  int RESERVED_IDENTIFIER = 49;
   /** RegularExpression Id. */
-  int GREATER_THAN_OR_EQUALS = 50;
+  int CONJUNCTION = 50;
   /** RegularExpression Id. */
-  int LESS_THAN = 51;
+  int DISJUNCTION = 51;
   /** RegularExpression Id. */
-  int LESS_THAN_OR_EQUALS = 52;
+  int UNARY_OPERATOR = 52;
   /** RegularExpression Id. */
-  int LINKS_TO = 53;
+  int BINARY_OPERATOR = 53;
   /** RegularExpression Id. */
-  int REGEX = 54;
+  int OPEN_ANGLE_BRACKET = 54;
   /** RegularExpression Id. */
-  int NOT_REGEX = 55;
+  int CLOSE_ANGLE_BRACKET = 55;
   /** RegularExpression Id. */
-  int LIKE = 56;
+  int EQUALS = 56;
   /** RegularExpression Id. */
-  int NOT_LIKE = 57;
+  int NOT_EQUALS = 57;
   /** RegularExpression Id. */
-  int BETWEEN = 58;
+  int GREATER_THAN = 58;
   /** RegularExpression Id. */
-  int PAGE = 59;
+  int GREATER_THAN_OR_EQUALS = 59;
   /** RegularExpression Id. */
-  int SIZE = 60;
+  int LESS_THAN = 60;
   /** RegularExpression Id. */
-  int ORDER = 61;
+  int LESS_THAN_OR_EQUALS = 61;
   /** RegularExpression Id. */
-  int ASC = 62;
+  int LINKS_TO = 62;
   /** RegularExpression Id. */
-  int DESC = 63;
+  int REGEX = 63;
   /** RegularExpression Id. */
-  int PIPE = 64;
+  int NOT_REGEX = 64;
   /** RegularExpression Id. */
-  int QUOTED_STRING = 65;
+  int LIKE = 65;
   /** RegularExpression Id. */
-  int DOUBLE_QUOTED_STRING = 66;
+  int NOT_LIKE = 66;
   /** RegularExpression Id. */
-  int SINGLE_QUOTED_STRING = 67;
+  int BETWEEN = 67;
   /** RegularExpression Id. */
-  int NUMERIC = 68;
+  int PAGE = 68;
   /** RegularExpression Id. */
-  int COMMA = 69;
+  int SIZE = 69;
   /** RegularExpression Id. */
-  int SIGNED_INTEGER = 70;
+  int ORDER = 70;
   /** RegularExpression Id. */
-  int SIGNED_DECIMAL = 71;
+  int ASC = 71;
   /** RegularExpression Id. */
-  int ALPHANUMERIC = 72;
+  int DESC = 72;
   /** RegularExpression Id. */
-  int PERIOD_SEPARATED_STRING = 73;
+  int PIPE = 73;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 74;
+  int QUOTED_STRING = 74;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC = 75;
+  int DOUBLE_QUOTED_STRING = 75;
   /** RegularExpression Id. */
-  int LETTER = 76;
+  int SINGLE_QUOTED_STRING = 76;
   /** RegularExpression Id. */
-  int DIGIT = 77;
+  int NUMERIC = 77;
   /** RegularExpression Id. */
-  int PERIOD = 78;
+  int COMMA = 78;
+  /** RegularExpression Id. */
+  int SIGNED_INTEGER = 79;
+  /** RegularExpression Id. */
+  int SIGNED_DECIMAL = 80;
+  /** RegularExpression Id. */
+  int ALPHANUMERIC = 81;
+  /** RegularExpression Id. */
+  int PERIOD_SEPARATED_STRING = 82;
+  /** RegularExpression Id. */
+  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 83;
+  /** RegularExpression Id. */
+  int NON_ALPHANUMERIC = 84;
+  /** RegularExpression Id. */
+  int LETTER = 85;
+  /** RegularExpression Id. */
+  int DIGIT = 86;
+  /** RegularExpression Id. */
+  int PERIOD = 87;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -181,12 +199,21 @@ public interface GrammarConstants {
     "\"link\"",
     "\"unlink\"",
     "\"select\"",
-    "\"fetch\"",
     "\"get\"",
+    "\"find\"",
     "\"describe\"",
-    "\"audit\"",
     "\"verify\"",
     "\"search\"",
+    "\"browse\"",
+    "\"chronologize\"",
+    "\"diff\"",
+    "\"inventory\"",
+    "\"jsonify\"",
+    "\"navigate\"",
+    "\"reconcile\"",
+    "\"review\"",
+    "\"trace\"",
+    "\"calculate\"",
     "\"stage\"",
     "\"commit\"",
     "\"abort\"",
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
index 729489e6..edcdd255 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
@@ -21,6 +21,7 @@
 import com.cinchapi.ccl.grammar.ValueSymbol;
 import com.cinchapi.ccl.grammar.PageSymbol;
 import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.syntax.AbstractSyntaxTree;
 import com.cinchapi.ccl.syntax.ConditionTree;
 import com.cinchapi.ccl.type.Operator;
@@ -55,117 +56,129 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 2;
          return jjMoveNfa_0(5, 0);
       case 10:
-         jjmatchedKind = 79;
+         jjmatchedKind = 88;
          return jjMoveNfa_0(5, 0);
       case 32:
          jjmatchedKind = 1;
          return jjMoveNfa_0(5, 0);
       case 36:
-         return jjMoveStringLiteralDfa1_0(0x10000000000L);
+         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x0L);
       case 40:
-         jjmatchedKind = 34;
+         jjmatchedKind = 43;
          return jjMoveNfa_0(5, 0);
       case 41:
-         jjmatchedKind = 35;
+         jjmatchedKind = 44;
          return jjMoveNfa_0(5, 0);
       case 44:
-         jjmatchedKind = 69;
+         jjmatchedKind = 78;
          return jjMoveNfa_0(5, 0);
       case 58:
-         jjmatchedKind = 33;
+         jjmatchedKind = 42;
          return jjMoveNfa_0(5, 0);
       case 60:
-         jjmatchedKind = 45;
+         jjmatchedKind = 54;
          return jjMoveNfa_0(5, 0);
       case 61:
-         jjmatchedKind = 81;
+         jjmatchedKind = 90;
          return jjMoveNfa_0(5, 0);
       case 62:
-         jjmatchedKind = 46;
+         jjmatchedKind = 55;
          return jjMoveNfa_0(5, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x4000000018210008L);
+         return jjMoveStringLiteralDfa1_0(0x3040000008L, 0x80L);
+      case 66:
+         return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L);
       case 67:
-         return jjMoveStringLiteralDfa1_0(0x100040L);
+         return jjMoveStringLiteralDfa1_0(0x28080040L, 0x0L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x8000000000008000L);
+         return jjMoveStringLiteralDfa1_0(0x108000L, 0x100L);
       case 70:
-         return jjMoveStringLiteralDfa1_0(0x22002000L);
+         return jjMoveStringLiteralDfa1_0(0x4400004000L, 0x0L);
       case 71:
-         return jjMoveStringLiteralDfa1_0(0x4000L);
+         return jjMoveStringLiteralDfa1_0(0x2000L, 0x0L);
       case 73:
-         return jjMoveStringLiteralDfa1_0(0x1800200L);
+         return jjMoveStringLiteralDfa1_0(0x300200200L, 0x0L);
+      case 74:
+         return jjMoveStringLiteralDfa1_0(0x400000L, 0x0L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x100000000000400L);
+         return jjMoveStringLiteralDfa1_0(0x400L, 0x2L);
+      case 78:
+         return jjMoveStringLiteralDfa1_0(0x800000L, 0x0L);
       case 79:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x40L);
       case 80:
-         return jjMoveStringLiteralDfa1_0(0x800000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x10L);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x40000000400020L);
+         return jjMoveStringLiteralDfa1_0(0x8000000083000020L, 0x0L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0x10000000000c1010L);
+         return jjMoveStringLiteralDfa1_0(0x10021010L, 0x20L);
       case 84:
-         return jjMoveStringLiteralDfa1_0(0x4000000L);
+         return jjMoveStringLiteralDfa1_0(0x804000000L, 0x0L);
       case 85:
-         return jjMoveStringLiteralDfa1_0(0x800L);
+         return jjMoveStringLiteralDfa1_0(0x800L, 0x0L);
       case 86:
-         return jjMoveStringLiteralDfa1_0(0x20000L);
+         return jjMoveStringLiteralDfa1_0(0x10000L, 0x0L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x8040000000L);
+         return jjMoveStringLiteralDfa1_0(0x1008000000000L, 0x0L);
       case 91:
-         jjmatchedKind = 36;
+         jjmatchedKind = 45;
          return jjMoveNfa_0(5, 0);
       case 93:
-         jjmatchedKind = 37;
+         jjmatchedKind = 46;
          return jjMoveNfa_0(5, 0);
       case 95:
-         jjmatchedKind = 80;
+         jjmatchedKind = 89;
          return jjMoveNfa_0(5, 0);
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x4000000018210008L);
+         return jjMoveStringLiteralDfa1_0(0x3040000008L, 0x80L);
+      case 98:
+         return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L);
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x100040L);
+         return jjMoveStringLiteralDfa1_0(0x28080040L, 0x0L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x8000000000008000L);
+         return jjMoveStringLiteralDfa1_0(0x108000L, 0x100L);
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x22002000L);
+         return jjMoveStringLiteralDfa1_0(0x4400004000L, 0x0L);
       case 103:
-         return jjMoveStringLiteralDfa1_0(0x4000L);
+         return jjMoveStringLiteralDfa1_0(0x2000L, 0x0L);
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x1800200L);
+         return jjMoveStringLiteralDfa1_0(0x300200200L, 0x0L);
+      case 106:
+         return jjMoveStringLiteralDfa1_0(0x400000L, 0x0L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x100000000000400L);
+         return jjMoveStringLiteralDfa1_0(0x400L, 0x2L);
+      case 110:
+         return jjMoveStringLiteralDfa1_0(0x800000L, 0x0L);
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x40L);
       case 112:
-         return jjMoveStringLiteralDfa1_0(0x800000000000000L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x10L);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x40000000400020L);
+         return jjMoveStringLiteralDfa1_0(0x8000000083000020L, 0x0L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x10000000000c1010L);
+         return jjMoveStringLiteralDfa1_0(0x10021010L, 0x20L);
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x4000000L);
+         return jjMoveStringLiteralDfa1_0(0x804000000L, 0x0L);
       case 117:
-         return jjMoveStringLiteralDfa1_0(0x800L);
+         return jjMoveStringLiteralDfa1_0(0x800L, 0x0L);
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x20000L);
+         return jjMoveStringLiteralDfa1_0(0x10000L, 0x0L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x8040000000L);
+         return jjMoveStringLiteralDfa1_0(0x1008000000000L, 0x0L);
       case 123:
-         jjmatchedKind = 31;
+         jjmatchedKind = 40;
          return jjMoveNfa_0(5, 0);
       case 124:
-         jjmatchedKind = 64;
+         jjmatchedKind = 73;
          return jjMoveNfa_0(5, 0);
       case 125:
-         jjmatchedKind = 32;
+         jjmatchedKind = 41;
          return jjMoveNfa_0(5, 0);
       default :
          return jjMoveNfa_0(5, 0);
    }
 }
-private int jjMoveStringLiteralDfa1_0(long active0){
+private int jjMoveStringLiteralDfa1_0(long active0, long active1){
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
    return jjMoveNfa_0(5, 0);
@@ -173,94 +186,90 @@ private int jjMoveStringLiteralDfa1_0(long active0){
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8800000L, active1, 0x10L);
       case 66:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000000L, active1, 0L);
       case 68:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8L, active1, 0L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x804000000046f030L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000008303b030L, active1, 0x100L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000000080000L, active1, 0L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1100010040000400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2008000104400L, active1, 0x22L);
       case 76:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40L, active1, 0L);
       case 78:
-         if ((active0 & 0x800000L) != 0L)
+         if ((active0 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 23;
+            jjmatchedKind = 32;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000a00L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200200a00L, active1, 0L);
       case 79:
-         if ((active0 & 0x4000000L) != 0L)
+         if ((active0 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 26;
+            jjmatchedKind = 35;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x20100000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4020000000L, active1, 0L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000002000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x404040000L, active1, 0x40L);
       case 83:
-         if ((active0 & 0x10000000L) != 0L)
+         if ((active0 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 37;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000008000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000400000L, active1, 0x80L);
       case 84:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000L);
-      case 85:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000L, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8800000L, active1, 0x10L);
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0x200000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000000L, active1, 0L);
       case 100:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x8L, active1, 0L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x804000000046f030L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800000008303b030L, active1, 0x100L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8000000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000000080000L, active1, 0L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1100010040000400L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x2008000104400L, active1, 0x22L);
       case 108:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40L, active1, 0L);
       case 110:
-         if ((active0 & 0x800000L) != 0L)
+         if ((active0 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 23;
+            jjmatchedKind = 32;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000a00L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x200200a00L, active1, 0L);
       case 111:
-         if ((active0 & 0x4000000L) != 0L)
+         if ((active0 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 26;
+            jjmatchedKind = 35;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x20100000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4020000000L, active1, 0L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2000000002000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x404040000L, active1, 0x40L);
       case 115:
-         if ((active0 & 0x10000000L) != 0L)
+         if ((active0 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 37;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x4000000008000000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1000400000L, active1, 0x80L);
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0x80000L);
-      case 117:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10000000L, active1, 0L);
       default :
          break;
    }
    return jjMoveNfa_0(5, 1);
 }
-private int jjMoveStringLiteralDfa2_0(long old0, long active0){
-   if (((active0 &= old0)) == 0L)
+private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjMoveNfa_0(5, 1);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -269,124 +278,128 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0){
    switch(curChar)
    {
       case 32:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000L, active1, 0L);
       case 65:
-         return jjMoveStringLiteralDfa3_0(active0, 0xc0000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x14020000L, active1, 0L);
       case 67:
-         if ((active0 & 0x4000000000000000L) != 0L)
+         if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 71;
             jjmatchedPos = 2;
          }
-         break;
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000L, active1, 0L);
       case 68:
          if ((active0 & 0x8L) != 0L)
          {
             jjmatchedKind = 3;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000010000010000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x40L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000040L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000040L, active1, 0L);
+      case 70:
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000L, active1, 0L);
       case 71:
-         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0x10L);
       case 75:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2L);
       case 76:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1800L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8001800L, active1, 0L);
       case 77:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100020L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000020L, active1, 0L);
       case 78:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4400L, active1, 0L);
       case 79:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2200000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x440440000L, active1, 0L);
       case 82:
-         if ((active0 & 0x20000000L) != 0L)
+         if ((active0 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 29;
+            jjmatchedKind = 38;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x90000L, active1, 0L);
       case 83:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000008200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8200L, active1, 0x100L);
       case 84:
          if ((active0 & 0x10L) != 0L)
          {
             jjmatchedKind = 4;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x4000L) != 0L)
+         else if ((active0 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 14;
+            jjmatchedKind = 13;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x41002000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8200000000L, active1, 0L);
       case 86:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x82a00000L, active1, 0L);
       case 90:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20L);
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0xc0000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x14020000L, active1, 0L);
       case 99:
-         if ((active0 & 0x4000000000000000L) != 0L)
+         if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 62;
+            jjmatchedKind = 71;
             jjmatchedPos = 2;
          }
-         break;
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000L, active1, 0L);
       case 100:
          if ((active0 & 0x8L) != 0L)
          {
             jjmatchedKind = 3;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000010000010000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x40L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000040L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000040L, active1, 0L);
+      case 102:
+         return jjMoveStringLiteralDfa3_0(active0, 0x100000L, active1, 0L);
       case 103:
-         return jjMoveStringLiteralDfa3_0(active0, 0x840000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0x10L);
       case 107:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2L);
       case 108:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1800L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8001800L, active1, 0L);
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100020L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20000020L, active1, 0L);
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4400L, active1, 0L);
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x2200000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x440440000L, active1, 0L);
       case 114:
-         if ((active0 & 0x20000000L) != 0L)
+         if ((active0 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 29;
+            jjmatchedKind = 38;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x90000L, active1, 0L);
       case 115:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000008200L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8200L, active1, 0x100L);
       case 116:
          if ((active0 & 0x10L) != 0L)
          {
             jjmatchedKind = 4;
             jjmatchedPos = 2;
          }
-         else if ((active0 & 0x4000L) != 0L)
+         else if ((active0 & 0x2000L) != 0L)
          {
-            jjmatchedKind = 14;
+            jjmatchedKind = 13;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x41002000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8200000000L, active1, 0L);
       case 118:
-         return jjMoveStringLiteralDfa3_0(active0, 0x400000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x82a00000L, active1, 0L);
       case 122:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000000000L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20L);
       default :
          break;
    }
    return jjMoveNfa_0(5, 2);
 }
-private int jjMoveStringLiteralDfa3_0(long old0, long active0){
-   if (((active0 &= old0)) == 0L)
+private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjMoveNfa_0(5, 2);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -395,49 +408,63 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0){
    switch(curChar)
    {
       case 36:
-         if ((active0 & 0x10000000000L) != 0L)
+         if ((active0 & 0x2000000000000L) != 0L)
          {
-            jjmatchedKind = 40;
+            jjmatchedKind = 49;
             jjmatchedPos = 3;
          }
          break;
       case 65:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40L, active1, 0L);
       case 67:
-         if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 72;
+            jjmatchedPos = 3;
+         }
+         return jjMoveStringLiteralDfa4_0(active0, 0xc008000L, active1, 0L);
+      case 68:
+         if ((active0 & 0x4000L) != 0L)
+         {
+            jjmatchedKind = 14;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0xa000L);
+         break;
       case 69:
-         if ((active0 & 0x100000000000000L) != 0L)
+         if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 65;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x800000000000000L) != 0L)
+         else if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 68;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x1000000000000000L) != 0L)
+         else if ((active1 & 0x20L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 69;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2040000000401200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000000080201200L, active1, 0x40L);
+      case 70:
+         if ((active0 & 0x100000L) != 0L)
+         {
+            jjmatchedKind = 20;
+            jjmatchedPos = 3;
+         }
+         break;
       case 71:
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000L, active1, 0L);
       case 72:
-         if ((active0 & 0x40000000L) != 0L)
+         if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 39;
             jjmatchedPos = 3;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa4_0(active0, 0x30800L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2810800L, active1, 0L);
       case 75:
          if ((active0 & 0x400L) != 0L)
          {
@@ -446,58 +473,76 @@ else if ((active0 & 0x1000000000000000L) != 0L)
          }
          break;
       case 77:
-         if ((active0 & 0x2000000L) != 0L)
+         if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 25;
+            jjmatchedKind = 34;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000000L, active1, 0L);
+      case 78:
+         return jjMoveStringLiteralDfa4_0(active0, 0x400000L, active1, 0L);
       case 79:
-         if ((active0 & 0x1000000L) != 0L)
+         if ((active0 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 24;
+            jjmatchedKind = 33;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000020L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1001080020L, active1, 0L);
       case 82:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000240000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000040020000L, active1, 0L);
+      case 87:
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000L, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40L, active1, 0L);
       case 99:
-         if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 72;
+            jjmatchedPos = 3;
+         }
+         return jjMoveStringLiteralDfa4_0(active0, 0xc008000L, active1, 0L);
+      case 100:
+         if ((active0 & 0x4000L) != 0L)
+         {
+            jjmatchedKind = 14;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0xa000L);
+         break;
       case 101:
-         if ((active0 & 0x100000000000000L) != 0L)
+         if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 56;
+            jjmatchedKind = 65;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x800000000000000L) != 0L)
+         else if ((active1 & 0x10L) != 0L)
          {
-            jjmatchedKind = 59;
+            jjmatchedKind = 68;
             jjmatchedPos = 3;
          }
-         else if ((active0 & 0x1000000000000000L) != 0L)
+         else if ((active1 & 0x20L) != 0L)
          {
-            jjmatchedKind = 60;
+            jjmatchedKind = 69;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x2040000000401200L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x8000000080201200L, active1, 0x40L);
+      case 102:
+         if ((active0 & 0x100000L) != 0L)
+         {
+            jjmatchedKind = 20;
+            jjmatchedPos = 3;
+         }
+         break;
       case 103:
-         return jjMoveStringLiteralDfa4_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x10000000L, active1, 0L);
       case 104:
-         if ((active0 & 0x40000000L) != 0L)
+         if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 39;
             jjmatchedPos = 3;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x30800L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x2810800L, active1, 0L);
       case 107:
          if ((active0 & 0x400L) != 0L)
          {
@@ -506,28 +551,32 @@ else if ((active0 & 0x1000000000000000L) != 0L)
          }
          break;
       case 109:
-         if ((active0 & 0x2000000L) != 0L)
+         if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 25;
+            jjmatchedKind = 34;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x20000000L, active1, 0L);
+      case 110:
+         return jjMoveStringLiteralDfa4_0(active0, 0x400000L, active1, 0L);
       case 111:
-         if ((active0 & 0x1000000L) != 0L)
+         if ((active0 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 24;
+            jjmatchedKind = 33;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000020L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1001080020L, active1, 0L);
       case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000240000L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000040020000L, active1, 0L);
+      case 119:
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000L, active1, 0L);
       default :
          break;
    }
    return jjMoveNfa_0(5, 3);
 }
-private int jjMoveStringLiteralDfa4_0(long old0, long active0){
-   if (((active0 &= old0)) == 0L)
+private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjMoveNfa_0(5, 3);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -536,122 +585,120 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0){
    switch(curChar)
    {
       case 67:
-         return jjMoveStringLiteralDfa5_0(active0, 0x41000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x21000L, active1, 0L);
       case 69:
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 19;
+            jjmatchedKind = 26;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x8000000000L) != 0L)
+         else if ((active0 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 28;
             jjmatchedPos = 4;
          }
-         break;
-      case 70:
-         if ((active0 & 0x8000000L) != 0L)
+         else if ((active0 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 27;
+            jjmatchedKind = 48;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000L);
-      case 72:
-         if ((active0 & 0x2000L) != 0L)
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000L, active1, 0L);
+      case 70:
+         if ((active0 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 13;
+            jjmatchedKind = 36;
             jjmatchedPos = 4;
          }
-         break;
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000L, active1, 0L);
+      case 71:
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000L, active1, 0L);
       case 73:
-         return jjMoveStringLiteralDfa5_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x20400000L, active1, 0L);
       case 78:
-         return jjMoveStringLiteralDfa5_0(active0, 0x800L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1280800L, active1, 0L);
       case 82:
          if ((active0 & 0x40L) != 0L)
          {
             jjmatchedKind = 6;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000408200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80008200L, active1, 0x40L);
+      case 83:
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000L, active1, 0L);
       case 84:
-         if ((active0 & 0x10000L) != 0L)
-         {
-            jjmatchedKind = 16;
-            jjmatchedPos = 4;
-         }
-         else if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 21;
+            jjmatchedKind = 30;
             jjmatchedPos = 4;
          }
          break;
+      case 85:
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000L, active1, 0L);
       case 86:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x20L, active1, 0L);
       case 88:
-         if ((active0 & 0x40000000000000L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 63;
             jjmatchedPos = 4;
          }
          break;
       case 99:
-         return jjMoveStringLiteralDfa5_0(active0, 0x41000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x21000L, active1, 0L);
       case 101:
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 19;
+            jjmatchedKind = 26;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x8000000000L) != 0L)
+         else if ((active0 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 28;
             jjmatchedPos = 4;
          }
-         break;
-      case 102:
-         if ((active0 & 0x8000000L) != 0L)
+         else if ((active0 & 0x1000000000000L) != 0L)
          {
-            jjmatchedKind = 27;
+            jjmatchedKind = 48;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x20000L);
-      case 104:
-         if ((active0 & 0x2000L) != 0L)
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000L, active1, 0L);
+      case 102:
+         if ((active0 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 13;
+            jjmatchedKind = 36;
             jjmatchedPos = 4;
          }
-         break;
+         return jjMoveStringLiteralDfa5_0(active0, 0x10000L, active1, 0L);
+      case 103:
+         return jjMoveStringLiteralDfa5_0(active0, 0x800000L, active1, 0L);
       case 105:
-         return jjMoveStringLiteralDfa5_0(active0, 0x100000L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x20400000L, active1, 0L);
       case 110:
-         return jjMoveStringLiteralDfa5_0(active0, 0x800L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x1280800L, active1, 0L);
       case 114:
          if ((active0 & 0x40L) != 0L)
          {
             jjmatchedKind = 6;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000000408200L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x80008200L, active1, 0x40L);
+      case 115:
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000L, active1, 0L);
       case 116:
-         if ((active0 & 0x10000L) != 0L)
-         {
-            jjmatchedKind = 16;
-            jjmatchedPos = 4;
-         }
-         else if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 21;
+            jjmatchedKind = 30;
             jjmatchedPos = 4;
          }
          break;
+      case 117:
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000L, active1, 0L);
       case 118:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x20L, active1, 0L);
       case 120:
-         if ((active0 & 0x40000000000000L) != 0L)
+         if ((active0 & 0x8000000000000000L) != 0L)
          {
-            jjmatchedKind = 54;
+            jjmatchedKind = 63;
             jjmatchedPos = 4;
          }
          break;
@@ -660,8 +707,8 @@ else if ((active0 & 0x200000L) != 0L)
    }
    return jjMoveNfa_0(5, 4);
 }
-private int jjMoveStringLiteralDfa5_0(long old0, long active0){
-   if (((active0 &= old0)) == 0L)
+private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjMoveNfa_0(5, 4);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -670,23 +717,34 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0){
    switch(curChar)
    {
       case 32:
-         return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40L);
+      case 65:
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0L);
+      case 67:
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0L);
       case 69:
          if ((active0 & 0x20L) != 0L)
          {
             jjmatchedKind = 5;
             jjmatchedPos = 5;
          }
+         else if ((active0 & 0x40000L) != 0L)
+         {
+            jjmatchedKind = 18;
+            jjmatchedPos = 5;
+         }
          break;
+      case 70:
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000L, active1, 0L);
       case 72:
-         if ((active0 & 0x40000L) != 0L)
+         if ((active0 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 18;
+            jjmatchedKind = 17;
             jjmatchedPos = 5;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000L, active1, 0L);
       case 75:
          if ((active0 & 0x800L) != 0L)
          {
@@ -694,6 +752,10 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0){
             jjmatchedPos = 5;
          }
          break;
+      case 76:
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000000L, active1, 0L);
+      case 79:
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000L, active1, 0L);
       case 84:
          if ((active0 & 0x200L) != 0L)
          {
@@ -705,40 +767,58 @@ else if ((active0 & 0x1000L) != 0L)
             jjmatchedKind = 12;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x100000L) != 0L)
+         else if ((active0 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 20;
+            jjmatchedKind = 29;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x400000L) != 0L)
+         else if ((active0 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 22;
+            jjmatchedKind = 31;
+            jjmatchedPos = 5;
+         }
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0L);
+      case 87:
+         if ((active0 & 0x2000000L) != 0L)
+         {
+            jjmatchedKind = 25;
             jjmatchedPos = 5;
          }
          break;
       case 89:
-         if ((active0 & 0x20000L) != 0L)
+         if ((active0 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 17;
+            jjmatchedKind = 16;
             jjmatchedPos = 5;
          }
          break;
+      case 97:
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0L);
+      case 99:
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0L);
       case 101:
          if ((active0 & 0x20L) != 0L)
          {
             jjmatchedKind = 5;
             jjmatchedPos = 5;
          }
+         else if ((active0 & 0x40000L) != 0L)
+         {
+            jjmatchedKind = 18;
+            jjmatchedPos = 5;
+         }
          break;
+      case 102:
+         return jjMoveStringLiteralDfa6_0(active0, 0x400000L, active1, 0L);
       case 104:
-         if ((active0 & 0x40000L) != 0L)
+         if ((active0 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 18;
+            jjmatchedKind = 17;
             jjmatchedPos = 5;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000L, active1, 0L);
       case 107:
          if ((active0 & 0x800L) != 0L)
          {
@@ -746,6 +826,10 @@ else if ((active0 & 0x400000L) != 0L)
             jjmatchedPos = 5;
          }
          break;
+      case 108:
+         return jjMoveStringLiteralDfa6_0(active0, 0x8000000L, active1, 0L);
+      case 111:
+         return jjMoveStringLiteralDfa6_0(active0, 0x80000L, active1, 0L);
       case 116:
          if ((active0 & 0x200L) != 0L)
          {
@@ -757,21 +841,28 @@ else if ((active0 & 0x1000L) != 0L)
             jjmatchedKind = 12;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x100000L) != 0L)
+         else if ((active0 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 20;
+            jjmatchedKind = 29;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x400000L) != 0L)
+         else if ((active0 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 22;
+            jjmatchedKind = 31;
+            jjmatchedPos = 5;
+         }
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0L);
+      case 119:
+         if ((active0 & 0x2000000L) != 0L)
+         {
+            jjmatchedKind = 25;
             jjmatchedPos = 5;
          }
          break;
       case 121:
-         if ((active0 & 0x20000L) != 0L)
+         if ((active0 & 0x10000L) != 0L)
          {
-            jjmatchedKind = 17;
+            jjmatchedKind = 16;
             jjmatchedPos = 5;
          }
          break;
@@ -780,8 +871,8 @@ else if ((active0 & 0x400000L) != 0L)
    }
    return jjMoveNfa_0(5, 5);
 }
-private int jjMoveStringLiteralDfa6_0(long old0, long active0){
-   if (((active0 &= old0)) == 0L)
+private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjMoveNfa_0(5, 5);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -789,17 +880,51 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0){
    }
    switch(curChar)
    {
+      case 65:
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000000L, active1, 0L);
       case 66:
-         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000008000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000L, active1, 0x40L);
+      case 73:
+         return jjMoveStringLiteralDfa7_0(active0, 0x1000000L, active1, 0L);
+      case 76:
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000L, active1, 0L);
+      case 79:
+         return jjMoveStringLiteralDfa7_0(active0, 0x200000L, active1, 0L);
+      case 84:
+         return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0L);
+      case 89:
+         if ((active0 & 0x400000L) != 0L)
+         {
+            jjmatchedKind = 22;
+            jjmatchedPos = 6;
+         }
+         break;
+      case 97:
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000000L, active1, 0L);
       case 98:
-         return jjMoveStringLiteralDfa7_0(active0, 0x2000000000008000L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x8000L, active1, 0x40L);
+      case 105:
+         return jjMoveStringLiteralDfa7_0(active0, 0x1000000L, active1, 0L);
+      case 108:
+         return jjMoveStringLiteralDfa7_0(active0, 0x80000L, active1, 0L);
+      case 111:
+         return jjMoveStringLiteralDfa7_0(active0, 0x200000L, active1, 0L);
+      case 116:
+         return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0L);
+      case 121:
+         if ((active0 & 0x400000L) != 0L)
+         {
+            jjmatchedKind = 22;
+            jjmatchedPos = 6;
+         }
+         break;
       default :
          break;
    }
    return jjMoveNfa_0(5, 6);
 }
-private int jjMoveStringLiteralDfa7_0(long old0, long active0){
-   if (((active0 &= old0)) == 0L)
+private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
       return jjMoveNfa_0(5, 6);
    try { curChar = input_stream.readChar(); }
    catch(java.io.IOException e) {
@@ -813,11 +938,24 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0){
             jjmatchedKind = 15;
             jjmatchedPos = 7;
          }
+         else if ((active0 & 0x800000L) != 0L)
+         {
+            jjmatchedKind = 23;
+            jjmatchedPos = 7;
+         }
          break;
+      case 76:
+         return jjMoveStringLiteralDfa8_0(active0, 0x1000000L, active1, 0L);
+      case 79:
+         return jjMoveStringLiteralDfa8_0(active0, 0x80000L, active1, 0L);
+      case 82:
+         return jjMoveStringLiteralDfa8_0(active0, 0x200000L, active1, 0L);
+      case 84:
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000000L, active1, 0L);
       case 89:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 70;
             jjmatchedPos = 7;
          }
          break;
@@ -827,11 +965,24 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0){
             jjmatchedKind = 15;
             jjmatchedPos = 7;
          }
+         else if ((active0 & 0x800000L) != 0L)
+         {
+            jjmatchedKind = 23;
+            jjmatchedPos = 7;
+         }
          break;
+      case 108:
+         return jjMoveStringLiteralDfa8_0(active0, 0x1000000L, active1, 0L);
+      case 111:
+         return jjMoveStringLiteralDfa8_0(active0, 0x80000L, active1, 0L);
+      case 114:
+         return jjMoveStringLiteralDfa8_0(active0, 0x200000L, active1, 0L);
+      case 116:
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000000L, active1, 0L);
       case 121:
-         if ((active0 & 0x2000000000000000L) != 0L)
+         if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 61;
+            jjmatchedKind = 70;
             jjmatchedPos = 7;
          }
          break;
@@ -840,6 +991,126 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0){
    }
    return jjMoveNfa_0(5, 7);
 }
+private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long active1){
+   if (((active0 &= old0) | (active1 &= old1)) == 0L)
+      return jjMoveNfa_0(5, 7);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+   return jjMoveNfa_0(5, 7);
+   }
+   switch(curChar)
+   {
+      case 69:
+         if ((active0 & 0x1000000L) != 0L)
+         {
+            jjmatchedKind = 24;
+            jjmatchedPos = 8;
+         }
+         else if ((active0 & 0x8000000L) != 0L)
+         {
+            jjmatchedKind = 27;
+            jjmatchedPos = 8;
+         }
+         break;
+      case 71:
+         return jjMoveStringLiteralDfa9_0(active0, 0x80000L);
+      case 89:
+         if ((active0 & 0x200000L) != 0L)
+         {
+            jjmatchedKind = 21;
+            jjmatchedPos = 8;
+         }
+         break;
+      case 101:
+         if ((active0 & 0x1000000L) != 0L)
+         {
+            jjmatchedKind = 24;
+            jjmatchedPos = 8;
+         }
+         else if ((active0 & 0x8000000L) != 0L)
+         {
+            jjmatchedKind = 27;
+            jjmatchedPos = 8;
+         }
+         break;
+      case 103:
+         return jjMoveStringLiteralDfa9_0(active0, 0x80000L);
+      case 121:
+         if ((active0 & 0x200000L) != 0L)
+         {
+            jjmatchedKind = 21;
+            jjmatchedPos = 8;
+         }
+         break;
+      default :
+         break;
+   }
+   return jjMoveNfa_0(5, 8);
+}
+private int jjMoveStringLiteralDfa9_0(long old0, long active0){
+   if (((active0 &= old0)) == 0L)
+      return jjMoveNfa_0(5, 8);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+   return jjMoveNfa_0(5, 8);
+   }
+   switch(curChar)
+   {
+      case 73:
+         return jjMoveStringLiteralDfa10_0(active0, 0x80000L);
+      case 105:
+         return jjMoveStringLiteralDfa10_0(active0, 0x80000L);
+      default :
+         break;
+   }
+   return jjMoveNfa_0(5, 9);
+}
+private int jjMoveStringLiteralDfa10_0(long old0, long active0){
+   if (((active0 &= old0)) == 0L)
+      return jjMoveNfa_0(5, 9);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+   return jjMoveNfa_0(5, 9);
+   }
+   switch(curChar)
+   {
+      case 90:
+         return jjMoveStringLiteralDfa11_0(active0, 0x80000L);
+      case 122:
+         return jjMoveStringLiteralDfa11_0(active0, 0x80000L);
+      default :
+         break;
+   }
+   return jjMoveNfa_0(5, 10);
+}
+private int jjMoveStringLiteralDfa11_0(long old0, long active0){
+   if (((active0 &= old0)) == 0L)
+      return jjMoveNfa_0(5, 10);
+   try { curChar = input_stream.readChar(); }
+   catch(java.io.IOException e) {
+   return jjMoveNfa_0(5, 10);
+   }
+   switch(curChar)
+   {
+      case 69:
+         if ((active0 & 0x80000L) != 0L)
+         {
+            jjmatchedKind = 19;
+            jjmatchedPos = 11;
+         }
+         break;
+      case 101:
+         if ((active0 & 0x80000L) != 0L)
+         {
+            jjmatchedKind = 19;
+            jjmatchedPos = 11;
+         }
+         break;
+      default :
+         break;
+   }
+   return jjMoveNfa_0(5, 11);
+}
 static final long[] jjbitVec0 = {
    0xfffffffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
 };
@@ -895,19 +1166,19 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 5:
                   if ((0xdfffecfeffffd9ffL & l) != 0L)
                   {
-                     if (kind > 74)
-                        kind = 74;
+                     if (kind > 83)
+                        kind = 83;
                      { jjCheckNAddTwoStates(18, 19); }
                   }
                   else if (curChar == 61)
                   {
-                     if (kind > 43)
-                        kind = 43;
+                     if (kind > 52)
+                        kind = 52;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 72)
-                        kind = 72;
+                     if (kind > 81)
+                        kind = 81;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0x280000000000L & l) != 0L)
@@ -926,13 +1197,13 @@ else if (curChar == 61)
                      { jjCheckNAdd(11); }
                   else if (curChar == 38)
                   {
-                     if (kind > 41)
-                        kind = 41;
+                     if (kind > 50)
+                        kind = 50;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 68)
-                        kind = 68;
+                     if (kind > 77)
+                        kind = 77;
                      { jjCheckNAddStates(16, 21); }
                   }
                   else if (curChar == 45)
@@ -941,28 +1212,28 @@ else if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 6;
                   break;
                case 6:
-                  if (curChar == 38 && kind > 41)
-                     kind = 41;
+                  if (curChar == 38 && kind > 50)
+                     kind = 50;
                   break;
                case 7:
                   if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 6;
                   break;
                case 8:
-                  if (curChar == 38 && kind > 41)
-                     kind = 41;
+                  if (curChar == 38 && kind > 50)
+                     kind = 50;
                   break;
                case 11:
-                  if (curChar == 61 && kind > 43)
-                     kind = 43;
+                  if (curChar == 61 && kind > 52)
+                     kind = 52;
                   break;
                case 12:
                   if (curChar == 61)
                      { jjCheckNAdd(11); }
                   break;
                case 13:
-                  if (curChar == 61 && kind > 43)
-                     kind = 43;
+                  if (curChar == 61 && kind > 52)
+                     kind = 52;
                   break;
                case 14:
                   if (curChar == 33)
@@ -973,8 +1244,8 @@ else if (curChar == 38)
                      { jjCheckNAdd(11); }
                   break;
                case 16:
-                  if (curChar == 62 && kind > 53)
-                     kind = 53;
+                  if (curChar == 62 && kind > 62)
+                     kind = 62;
                   break;
                case 17:
                   if (curChar == 45)
@@ -983,15 +1254,15 @@ else if (curChar == 38)
                case 18:
                   if ((0xdfffecfeffffd9ffL & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 83)
+                     kind = 83;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 19:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 83)
+                     kind = 83;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 77:
@@ -999,8 +1270,8 @@ else if (curChar == 38)
                      { jjCheckNAddTwoStates(11, 78); }
                   break;
                case 78:
-                  if (curChar == 60 && kind > 44)
-                     kind = 44;
+                  if (curChar == 60 && kind > 53)
+                     kind = 53;
                   break;
                case 81:
                case 82:
@@ -1022,8 +1293,8 @@ else if (curChar == 38)
                      { jjCheckNAddStates(28, 30); }
                   break;
                case 92:
-                  if (curChar == 34 && kind > 65)
-                     kind = 65;
+                  if (curChar == 34 && kind > 74)
+                     kind = 74;
                   break;
                case 94:
                   { jjCheckNAddStates(31, 33); }
@@ -1033,8 +1304,8 @@ else if (curChar == 38)
                      { jjCheckNAddStates(31, 33); }
                   break;
                case 96:
-                  if (curChar == 34 && kind > 66)
-                     kind = 66;
+                  if (curChar == 34 && kind > 75)
+                     kind = 75;
                   break;
                case 99:
                case 100:
@@ -1064,8 +1335,8 @@ else if (curChar == 38)
                      { jjCheckNAddStates(46, 48); }
                   break;
                case 119:
-                  if (curChar == 39 && kind > 65)
-                     kind = 65;
+                  if (curChar == 39 && kind > 74)
+                     kind = 74;
                   break;
                case 121:
                   { jjCheckNAddStates(49, 51); }
@@ -1075,28 +1346,28 @@ else if (curChar == 38)
                      { jjCheckNAddStates(49, 51); }
                   break;
                case 123:
-                  if (curChar == 39 && kind > 67)
-                     kind = 67;
+                  if (curChar == 39 && kind > 76)
+                     kind = 76;
                   break;
                case 124:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 77)
+                     kind = 77;
                   { jjCheckNAddStates(16, 21); }
                   break;
                case 125:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 68)
-                     kind = 68;
+                  if (kind > 77)
+                     kind = 77;
                   { jjCheckNAdd(125); }
                   break;
                case 126:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 70)
-                     kind = 70;
+                  if (kind > 79)
+                     kind = 79;
                   { jjCheckNAdd(126); }
                   break;
                case 127:
@@ -1110,8 +1381,8 @@ else if (curChar == 38)
                case 129:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 71)
-                     kind = 71;
+                  if (kind > 80)
+                     kind = 80;
                   { jjCheckNAdd(129); }
                   break;
                case 130:
@@ -1125,8 +1396,8 @@ else if (curChar == 38)
                case 132:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 82)
+                     kind = 82;
                   { jjCheckNAddTwoStates(132, 133); }
                   break;
                case 133:
@@ -1148,15 +1419,15 @@ else if (curChar == 38)
                case 137:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 82)
+                     kind = 82;
                   { jjCheckNAddTwoStates(133, 137); }
                   break;
                case 138:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 82)
+                     kind = 82;
                   { jjCheckNAddTwoStates(133, 138); }
                   break;
                case 139:
@@ -1166,27 +1437,27 @@ else if (curChar == 38)
                case 140:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 81)
+                     kind = 81;
                   { jjCheckNAddStates(0, 4); }
                   break;
                case 141:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 81)
+                     kind = 81;
                   { jjCheckNAdd(141); }
                   break;
                case 142:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 82)
+                     kind = 82;
                   { jjCheckNAddTwoStates(142, 133); }
                   break;
                case 200:
-                  if (curChar == 50 && kind > 53)
-                     kind = 53;
+                  if (curChar == 50 && kind > 62)
+                     kind = 62;
                   break;
                default : break;
             }
@@ -1202,14 +1473,14 @@ else if (curChar < 128)
                case 5:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 72)
-                        kind = 72;
+                     if (kind > 81)
+                        kind = 81;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0xf800000150000001L & l) != 0L)
                   {
-                     if (kind > 74)
-                        kind = 74;
+                     if (kind > 83)
+                        kind = 83;
                      { jjCheckNAddTwoStates(18, 19); }
                   }
                   if ((0x40000000400000L & l) != 0L)
@@ -1236,8 +1507,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 9;
                   break;
                case 0:
-                  if ((0x8000000080L & l) != 0L && kind > 38)
-                     kind = 38;
+                  if ((0x8000000080L & l) != 0L && kind > 47)
+                     kind = 47;
                   break;
                case 1:
                   if ((0x400000004000L & l) != 0L)
@@ -1256,8 +1527,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 3;
                   break;
                case 9:
-                  if (curChar == 124 && kind > 42)
-                     kind = 42;
+                  if (curChar == 124 && kind > 51)
+                     kind = 51;
                   break;
                case 10:
                   if (curChar == 124)
@@ -1266,15 +1537,15 @@ else if (curChar == 124)
                case 18:
                   if ((0xf800000150000001L & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 83)
+                     kind = 83;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 19:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 83)
+                     kind = 83;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 20:
@@ -1282,12 +1553,12 @@ else if (curChar == 124)
                      { jjAddStates(82, 83); }
                   break;
                case 21:
-                  if ((0x80000000800000L & l) != 0L && kind > 44)
-                     kind = 44;
+                  if ((0x80000000800000L & l) != 0L && kind > 53)
+                     kind = 53;
                   break;
                case 22:
-                  if ((0x400000004000L & l) != 0L && kind > 44)
-                     kind = 44;
+                  if ((0x400000004000L & l) != 0L && kind > 53)
+                     kind = 53;
                   break;
                case 23:
                   if ((0x2000000020L & l) != 0L)
@@ -1314,8 +1585,8 @@ else if (curChar == 124)
                      { jjAddStates(80, 81); }
                   break;
                case 29:
-                  if ((0x8000000080000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x8000000080000L & l) != 0L && kind > 52)
+                     kind = 52;
                   break;
                case 30:
                case 48:
@@ -1337,16 +1608,16 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 32;
                   break;
                case 34:
-                  if ((0x2000000020000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x2000000020000L & l) != 0L && kind > 52)
+                     kind = 52;
                   break;
                case 35:
                   if ((0x8000000080L & l) != 0L)
                      { jjCheckNAddStates(76, 79); }
                   break;
                case 36:
-                  if ((0x400000004000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x400000004000L & l) != 0L && kind > 52)
+                     kind = 52;
                   break;
                case 37:
                case 175:
@@ -1390,8 +1661,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 45;
                   break;
                case 47:
-                  if ((0x10000000100000L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x10000000100000L & l) != 0L && kind > 52)
+                     kind = 52;
                   break;
                case 49:
                   if ((0x200000002L & l) != 0L)
@@ -1470,8 +1741,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 66;
                   break;
                case 68:
-                  if ((0x2000000020L & l) != 0L && kind > 43)
-                     kind = 43;
+                  if ((0x2000000020L & l) != 0L && kind > 52)
+                     kind = 52;
                   break;
                case 69:
                case 199:
@@ -1483,12 +1754,12 @@ else if (curChar == 124)
                      { jjAddStates(74, 75); }
                   break;
                case 71:
-                  if ((0x10000000100000L & l) != 0L && kind > 38)
-                     kind = 38;
+                  if ((0x10000000100000L & l) != 0L && kind > 47)
+                     kind = 47;
                   break;
                case 72:
-                  if ((0x1000000010L & l) != 0L && kind > 41)
-                     kind = 41;
+                  if ((0x1000000010L & l) != 0L && kind > 50)
+                     kind = 50;
                   break;
                case 73:
                   if ((0x400000004000L & l) != 0L)
@@ -1499,12 +1770,12 @@ else if (curChar == 124)
                      { jjAddStates(72, 73); }
                   break;
                case 75:
-                  if ((0x400000004000L & l) != 0L && kind > 38)
-                     kind = 38;
+                  if ((0x400000004000L & l) != 0L && kind > 47)
+                     kind = 47;
                   break;
                case 76:
-                  if ((0x4000000040000L & l) != 0L && kind > 42)
-                     kind = 42;
+                  if ((0x4000000040000L & l) != 0L && kind > 51)
+                     kind = 51;
                   break;
                case 80:
                   if (curChar == 92)
@@ -1566,8 +1837,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(34, 36); }
                   break;
                case 101:
-                  if (curChar == 96 && kind > 65)
-                     kind = 65;
+                  if (curChar == 96 && kind > 74)
+                     kind = 74;
                   break;
                case 102:
                   if (curChar == 92)
@@ -1581,8 +1852,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(37, 39); }
                   break;
                case 105:
-                  if (curChar == 96 && kind > 67)
-                     kind = 67;
+                  if (curChar == 96 && kind > 76)
+                     kind = 76;
                   break;
                case 107:
                   if (curChar == 92)
@@ -1631,29 +1902,29 @@ else if (curChar == 124)
                case 138:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 82)
+                     kind = 82;
                   { jjCheckNAddTwoStates(133, 138); }
                   break;
                case 140:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 81)
+                     kind = 81;
                   { jjCheckNAddStates(0, 4); }
                   break;
                case 141:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 72)
-                     kind = 72;
+                  if (kind > 81)
+                     kind = 81;
                   { jjCheckNAdd(141); }
                   break;
                case 142:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 73)
-                     kind = 73;
+                  if (kind > 82)
+                     kind = 82;
                   { jjCheckNAddTwoStates(142, 133); }
                   break;
                case 143:
@@ -1689,8 +1960,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 150;
                   break;
                case 152:
-                  if ((0x100000001000000L & l) != 0L && kind > 55)
-                     kind = 55;
+                  if ((0x100000001000000L & l) != 0L && kind > 64)
+                     kind = 64;
                   break;
                case 153:
                case 157:
@@ -1734,8 +2005,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 162;
                   break;
                case 164:
-                  if ((0x2000000020L & l) != 0L && kind > 57)
-                     kind = 57;
+                  if ((0x2000000020L & l) != 0L && kind > 66)
+                     kind = 66;
                   break;
                case 165:
                case 168:
@@ -1883,8 +2154,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 204;
                   break;
                case 206:
-                  if ((0x800000008000L & l) != 0L && kind > 53)
-                     kind = 53;
+                  if ((0x800000008000L & l) != 0L && kind > 62)
+                     kind = 62;
                   break;
                case 207:
                   if ((0x10000000100000L & l) != 0L)
@@ -2110,8 +2381,8 @@ else if (curChar == 124)
                case 5:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                   {
-                     if (kind > 74)
-                        kind = 74;
+                     if (kind > 83)
+                        kind = 83;
                      { jjCheckNAddTwoStates(18, 19); }
                   }
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
@@ -2122,8 +2393,8 @@ else if (curChar == 124)
                case 18:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 74)
-                     kind = 74;
+                  if (kind > 83)
+                     kind = 83;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 79:
@@ -2139,8 +2410,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(22, 24); }
                   break;
                case 83:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 65)
-                     kind = 65;
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 74)
+                     kind = 74;
                   break;
                case 85:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -2151,8 +2422,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(25, 27); }
                   break;
                case 87:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 66)
-                     kind = 66;
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 75)
+                     kind = 75;
                   break;
                case 90:
                case 91:
@@ -2187,8 +2458,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(40, 42); }
                   break;
                case 110:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 65)
-                     kind = 65;
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 74)
+                     kind = 74;
                   break;
                case 112:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -2199,8 +2470,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(43, 45); }
                   break;
                case 114:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 67)
-                     kind = 67;
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 76)
+                     kind = 76;
                   break;
                case 117:
                case 118:
@@ -2253,11 +2524,11 @@ else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
 public static final String[] jjstrLiteralImages = {
 "", null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, "\173", "\175", "\72", "\50", "\51", "\133", "\135", null, 
-null, null, null, null, null, null, "\74", "\76", null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, "\174", null, null, 
-null, null, "\54", null, null, null, null, null, null, null, null, null, "\12", 
-"\137", "\75", };
+null, null, null, null, null, null, null, null, null, null, null, null, null, 
+"\173", "\175", "\72", "\50", "\51", "\133", "\135", null, null, null, null, null, 
+null, null, "\74", "\76", null, null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, "\174", null, null, null, null, "\54", 
+null, null, null, null, null, null, null, null, null, "\12", "\137", "\75", };
 protected Token jjFillToken()
 {
    final Token t;
@@ -2555,10 +2826,10 @@ public void SwitchTo(int lexState)
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xfbe07ffffffffff9L, 0x387ffL, 
+   0xc0fffffffffffff9L, 0x70ffff7L, 
 };
 static final long[] jjtoSkip = {
    0x6L, 0x0L, 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java
index 79be1a6b..5dcd4650 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/AddSymbol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017 Cinchapi Inc.
+ * Copyright (c) 2013-2024 Cinchapi Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,6 +9,8 @@
  */
 package com.cinchapi.ccl.grammar.command;
 
+import java.util.Collection;
+import javax.annotation.Nullable;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 
@@ -18,10 +20,24 @@
 public class AddSymbol implements CommandSymbol {
     private final KeyTokenSymbol<?> key;
     private final ValueTokenSymbol<?> value;
-    private final long record;
+    private final Long record;
+    private final Collection<Long> records;
 
     /**
-     * Construct a new instance.
+     * Construct a new instance for adding to a new record.
+     *
+     * @param key the key to add
+     * @param value the value to add
+     */
+    public AddSymbol(KeyTokenSymbol<?> key, ValueTokenSymbol<?> value) {
+        this.key = key;
+        this.value = value;
+        this.record = null;
+        this.records = null;
+    }
+
+    /**
+     * Construct a new instance for adding to a specific record.
      *
      * @param key the key to add
      * @param value the value to add
@@ -31,6 +47,21 @@ public AddSymbol(KeyTokenSymbol<?> key, ValueTokenSymbol<?> value, long record)
         this.key = key;
         this.value = value;
         this.record = record;
+        this.records = null;
+    }
+
+    /**
+     * Construct a new instance for adding to multiple records.
+     *
+     * @param key the key to add
+     * @param value the value to add
+     * @param records collection of record identifiers
+     */
+    public AddSymbol(KeyTokenSymbol<?> key, ValueTokenSymbol<?> value, Collection<Long> records) {
+        this.key = key;
+        this.value = value;
+        this.record = null;
+        this.records = records;
     }
 
     @Override
@@ -53,9 +84,20 @@ public ValueTokenSymbol<?> value() {
     }
 
     /**
-     * Return the record identifier.
+     * Return the record identifier if adding to a single record.
+     * Returns null if adding to a new record or multiple records.
      */
-    public long record() {
+    @Nullable
+    public Long record() {
         return record;
     }
+
+    /**
+     * Return the collection of record identifiers if adding to multiple records.
+     * Returns null if adding to a new record or single record.
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java
deleted file mode 100644
index 13f93984..00000000
--- a/src/main/java/com/cinchapi/ccl/grammar/command/AuditSymbol.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- */
-package com.cinchapi.ccl.grammar.command;
-
-import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-
-import javax.annotation.Nullable;
-
-/**
- * A {@link CommandSymbol} that represents an AUDIT command.
- */
-public class AuditSymbol implements CommandSymbol {
-    private final KeyTokenSymbol<?> key;
-    private final long record;
-
-    /**
-     * Construct a new instance.
-     *
-     * @param key optional key to audit, if null audits entire record
-     * @param record the record identifier
-     */
-    public AuditSymbol(@Nullable KeyTokenSymbol<?> key, long record) {
-        this.key = key;
-        this.record = record;
-    }
-
-    @Override
-    public String type() {
-        return "AUDIT";
-    }
-
-    /**
-     * Return the key to audit, if specified.
-     */
-    @Nullable
-    public KeyTokenSymbol<?> key() {
-        return key;
-    }
-
-    /**
-     * Return the record identifier.
-     */
-    public long record() {
-        return record;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/BrowseSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/BrowseSymbol.java
new file mode 100644
index 00000000..97817cc3
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/BrowseSymbol.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a BROWSE command
+ */
+public class BrowseSymbol implements CommandSymbol {
+    private final Collection<KeyTokenSymbol<?>> keys;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance for browsing current values.
+     *
+     * @param keys a collection of field names
+     */
+    public BrowseSymbol(Collection<KeyTokenSymbol<?>> keys) {
+        this(keys, null);
+    }
+
+    /**
+     * Construct a new instance for browsing historical values.
+     *
+     * @param keys a collection of field names
+     * @param timestamp optional timestamp for historical browsing
+     */
+    public BrowseSymbol(Collection<KeyTokenSymbol<?>> keys, @Nullable TimestampSymbol timestamp) {
+        this.keys = keys;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "BROWSE";
+    }
+
+    /**
+     * Return the keys to browse.
+     *
+     * @return the collection of keys
+     */
+    public Collection<KeyTokenSymbol<?>> keys() {
+        return keys;
+    }
+
+    /**
+     * Return the timestamp for historical browsing.
+     *
+     * @return the timestamp if specified, otherwise {@code null}
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/ChronologizeSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/ChronologizeSymbol.java
new file mode 100644
index 00000000..b53d5f2c
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/ChronologizeSymbol.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a CHRONOLOGIZE command.
+ */
+public class ChronologizeSymbol implements CommandSymbol {
+    private final KeyTokenSymbol<?> key;
+    private final long record;
+    private final TimestampSymbol start;
+    private final TimestampSymbol end;
+
+    /**
+     * Construct a new instance for chronologizing all changes.
+     *
+     * @param key the field name
+     * @param record the record id
+     */
+    public ChronologizeSymbol(KeyTokenSymbol<?> key, long record) {
+        this(key, record, null, null);
+    }
+
+    /**
+     * Construct a new instance for chronologizing changes after a start time.
+     *
+     * @param key the field name
+     * @param record the record id
+     * @param start the inclusive start timestamp
+     */
+    public ChronologizeSymbol(KeyTokenSymbol<?> key, long record, TimestampSymbol start) {
+        this(key, record, start, null);
+    }
+
+    /**
+     * Construct a new instance for chronologizing changes in a time range.
+     *
+     * @param key the field name
+     * @param record the record id
+     * @param start the inclusive start timestamp
+     * @param end the non-inclusive end timestamp
+     */
+    public ChronologizeSymbol(KeyTokenSymbol<?> key, long record,
+                              @Nullable TimestampSymbol start, @Nullable TimestampSymbol end) {
+        this.key = key;
+        this.record = record;
+        this.start = start;
+        this.end = end;
+    }
+
+    @Override
+    public String type() {
+        return "CHRONOLOGIZE";
+    }
+
+    /**
+     * Return the key to chronologize.
+     *
+     * @return the field name
+     */
+    public KeyTokenSymbol<?> key() {
+        return key;
+    }
+
+    /**
+     * Return the record identifier.
+     *
+     * @return the record id
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the start timestamp.
+     *
+     * @return the inclusive start timestamp if specified, otherwise {@code null}
+     */
+    @Nullable
+    public TimestampSymbol start() {
+        return start;
+    }
+
+    /**
+     * Return the end timestamp.
+     *
+     * @return the non-inclusive end timestamp if specified, otherwise {@code null}
+     */
+    @Nullable
+    public TimestampSymbol end() {
+        return end;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/DescribeSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/DescribeSymbol.java
index b8ebdd6f..86acd652 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/DescribeSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/DescribeSymbol.java
@@ -37,7 +37,7 @@ public DescribeSymbol(Collection<Long> records, @Nullable TimestampSymbol timest
 
     private DescribeSymbol(long record, @Nullable Collection<Long> records,
                            @Nullable TimestampSymbol timestamp) {
-        this.record = record;
+        this.record = record == -1 ? 0 : record;
         this.records = records;
         this.timestamp = timestamp;
     }
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/DiffSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/DiffSymbol.java
new file mode 100644
index 00000000..904445fa
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/DiffSymbol.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a DIFF command.
+ */
+public class DiffSymbol implements CommandSymbol {
+    private final KeyTokenSymbol<?> key;
+    private final Long record;
+    private final TimestampSymbol start;
+    private final TimestampSymbol end;
+
+    /**
+     * Construct a new instance for diffing changes to a record.
+     *
+     * @param record the record id
+     * @param start the base timestamp for comparison
+     */
+    public DiffSymbol(long record, TimestampSymbol start) {
+        this(null, record, start, null);
+    }
+
+    /**
+     * Construct a new instance for diffing changes to a specific key in a record.
+     *
+     * @param key the field name
+     * @param record the record id
+     * @param start the base timestamp for comparison
+     */
+    public DiffSymbol(KeyTokenSymbol<?> key, long record, TimestampSymbol start) {
+        this(key, record, start, null);
+    }
+
+    /**
+     * Construct a new instance for diffing changes between two timestamps.
+     *
+     * @param key the field name, if diffing a specific field
+     * @param record the record id
+     * @param start the base timestamp for comparison
+     * @param end the comparison timestamp
+     */
+    public DiffSymbol(@Nullable KeyTokenSymbol<?> key, long record,
+                      TimestampSymbol start, @Nullable TimestampSymbol end) {
+        this.key = key;
+        this.record = record;
+        this.start = start;
+        this.end = end;
+    }
+
+    @Override
+    public String type() {
+        return "DIFF";
+    }
+
+    /**
+     * Return the key to diff if specified.
+     *
+     * @return the field name or {@code null} if diffing entire record
+     */
+    @Nullable
+    public KeyTokenSymbol<?> key() {
+        return key;
+    }
+
+    /**
+     * Return the record identifier.
+     *
+     * @return the record id
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the base timestamp for comparison.
+     *
+     * @return the start timestamp
+     */
+    public TimestampSymbol start() {
+        return start;
+    }
+
+    /**
+     * Return the comparison timestamp.
+     *
+     * @return the end timestamp if specified, otherwise {@code null}
+     */
+    @Nullable
+    public TimestampSymbol end() {
+        return end;
+    }
+}
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java
deleted file mode 100644
index 8bd571ec..00000000
--- a/src/main/java/com/cinchapi/ccl/grammar/command/FetchSymbol.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2013-2017 Cinchapi Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- */
-package com.cinchapi.ccl.grammar.command;
-
-import java.util.Collection;
-import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.TimestampSymbol;
-
-/**
- * A {@link CommandSymbol} that represents a FETCH command.
- */
-public class FetchSymbol implements CommandSymbol {
-    private final KeyTokenSymbol<?> key;
-    private final Collection<KeyTokenSymbol<?>> keys;
-    private final long record;
-    private final Collection<Long> records;
-    private final TimestampSymbol timestamp;
-
-    /**
-     * Construct a new instance for single key and record.
-     */
-    public FetchSymbol(KeyTokenSymbol<?> key, long record, @Nullable TimestampSymbol timestamp) {
-        this(key, null, record, null, timestamp);
-    }
-
-    /**
-     * Construct a new instance for multiple keys and single record.
-     */
-    public FetchSymbol(Collection<KeyTokenSymbol<?>> keys, long record, @Nullable TimestampSymbol timestamp) {
-        this(null, keys, record, null, timestamp);
-    }
-
-    /**
-     * Construct a new instance for single key and multiple records.
-     */
-    public FetchSymbol(KeyTokenSymbol<?> key, Collection<Long> records, @Nullable TimestampSymbol timestamp) {
-        this(key, null, -1, records, timestamp);
-    }
-
-    /**
-     * Construct a new instance for multiple keys and records.
-     */
-    public FetchSymbol(Collection<KeyTokenSymbol<?>> keys, Collection<Long> records,
-                       @Nullable TimestampSymbol timestamp) {
-        this(null, keys, -1, records, timestamp);
-    }
-
-    private FetchSymbol(@Nullable KeyTokenSymbol<?> key, @Nullable Collection<KeyTokenSymbol<?>> keys,
-                        long record, @Nullable Collection<Long> records, @Nullable TimestampSymbol timestamp) {
-        this.key = key;
-        this.keys = keys;
-        this.record = record;
-        this.records = records;
-        this.timestamp = timestamp;
-    }
-
-    @Override
-    public String type() {
-        return "FETCH";
-    }
-
-    /**
-     * Return the key to fetch, if operating on a single key.
-     */
-    @Nullable
-    public KeyTokenSymbol<?> key() {
-        return key;
-    }
-
-    /**
-     * Return the keys to fetch, if operating on multiple keys.
-     */
-    @Nullable
-    public Collection<KeyTokenSymbol<?>> keys() {
-        return keys;
-    }
-
-    /**
-     * Return the record identifier, if operating on a single record.
-     */
-    public long record() {
-        return record;
-    }
-
-    /**
-     * Return the record identifiers, if operating on multiple records.
-     */
-    @Nullable
-    public Collection<Long> records() {
-        return records;
-    }
-
-    /**
-     * Return the timestamp for historical fetch.
-     */
-    @Nullable
-    public TimestampSymbol timestamp() {
-        return timestamp;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java
index 164cecbc..e672dcbf 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/FindSymbol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017 Cinchapi Inc.
+ * Copyright (c) 2013-2024 Cinchapi Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -10,49 +10,21 @@
 package com.cinchapi.ccl.grammar.command;
 
 import javax.annotation.Nullable;
-import com.cinchapi.ccl.grammar.KeyTokenSymbol;
-import com.cinchapi.ccl.grammar.ValueTokenSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
-import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.PageSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a FIND command.
  */
 public class FindSymbol implements CommandSymbol {
-    private final KeyTokenSymbol<?> key;
-    private final Operator operator;
-    private final ValueTokenSymbol<?> value;
-    private final ValueTokenSymbol<?> value2;
     private final TimestampSymbol timestamp;
 
     /**
-     * Construct a new instance for unary operation.
-     *
-     * @param key the key to find
-     * @param operator the operator to use
-     * @param value the value to compare
-     * @param timestamp optional timestamp for historical search
+     * Construct a new instance for expression-based finding.
      */
-    public FindSymbol(KeyTokenSymbol<?> key, Operator operator, ValueTokenSymbol<?> value,
-                      @Nullable TimestampSymbol timestamp) {
-        this(key, operator, value, null, timestamp);
-    }
-
-    /**
-     * Construct a new instance for binary operation.
-     *
-     * @param key the key to find
-     * @param operator the operator to use
-     * @param value the first value to compare
-     * @param value2 the second value to compare
-     * @param timestamp optional timestamp for historical search
-     */
-    public FindSymbol(KeyTokenSymbol<?> key, Operator operator, ValueTokenSymbol<?> value,
-                      @Nullable ValueTokenSymbol<?> value2, @Nullable TimestampSymbol timestamp) {
-        this.key = key;
-        this.operator = operator;
-        this.value = value;
-        this.value2 = value2;
+    public FindSymbol(@Nullable TimestampSymbol timestamp) {
         this.timestamp = timestamp;
     }
 
@@ -61,35 +33,6 @@ public String type() {
         return "FIND";
     }
 
-    /**
-     * Return the key to find.
-     */
-    public KeyTokenSymbol<?> key() {
-        return key;
-    }
-
-    /**
-     * Return the operator to use.
-     */
-    public Operator operator() {
-        return operator;
-    }
-
-    /**
-     * Return the value to compare.
-     */
-    public ValueTokenSymbol<?> value() {
-        return value;
-    }
-
-    /**
-     * Return the second value for binary operations.
-     */
-    @Nullable
-    public ValueTokenSymbol<?> value2() {
-        return value2;
-    }
-
     /**
      * Return the timestamp for historical search.
      */
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java
index 82686a16..5f12a60a 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/GetSymbol.java
@@ -25,36 +25,48 @@ public class GetSymbol implements CommandSymbol {
     private final TimestampSymbol timestamp;
 
     /**
-     * Construct a new instance for single key and record.
+     * Construct a new instance for keys with optional where clause and timestamp.
      */
-    public GetSymbol(KeyTokenSymbol<?> key, long record, @Nullable TimestampSymbol timestamp) {
-        this(key, null, record, null, timestamp);
+    public GetSymbol(Collection<KeyTokenSymbol<?>> keys, TimestampSymbol timestamp) {
+        this(null, keys, -1, null, timestamp);
     }
 
     /**
-     * Construct a new instance for multiple keys and single record.
+     * Construct a new instance for single key and record.
      */
-    public GetSymbol(Collection<KeyTokenSymbol<?>> keys, long record, @Nullable TimestampSymbol timestamp) {
-        this(null, keys, record, null, timestamp);
+    public GetSymbol(KeyTokenSymbol<?> key, long record, TimestampSymbol timestamp) {
+        this(key, null, record, null, timestamp);
     }
 
     /**
      * Construct a new instance for single key and multiple records.
      */
-    public GetSymbol(KeyTokenSymbol<?> key, Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+    public GetSymbol(KeyTokenSymbol<?> key, Collection<Long> records, TimestampSymbol timestamp) {
         this(key, null, -1, records, timestamp);
     }
 
+    /**
+     * Construct a new instance for multiple keys and single record.
+     */
+    public GetSymbol(Collection<KeyTokenSymbol<?>> keys, long record, TimestampSymbol timestamp) {
+        this(null, keys, record, null, timestamp);
+    }
+
     /**
      * Construct a new instance for multiple keys and records.
      */
-    public GetSymbol(Collection<KeyTokenSymbol<?>> keys, Collection<Long> records,
-                     @Nullable TimestampSymbol timestamp) {
+    public GetSymbol(Collection<KeyTokenSymbol<?>> keys, Collection<Long> records, TimestampSymbol timestamp) {
         this(null, keys, -1, records, timestamp);
     }
 
-    private GetSymbol(@Nullable KeyTokenSymbol<?> key, @Nullable Collection<KeyTokenSymbol<?>> keys,
-                      long record, @Nullable Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+    /**
+     * Comprehensive constructor to handle all variations.
+     */
+    private GetSymbol(KeyTokenSymbol<?> key,
+                      Collection<KeyTokenSymbol<?>> keys,
+                      long record,
+                      Collection<Long> records,
+                      TimestampSymbol timestamp) {
         this.key = key;
         this.keys = keys;
         this.record = record;
@@ -67,40 +79,25 @@ public String type() {
         return "GET";
     }
 
-    /**
-     * Return the key to get, if operating on a single key.
-     */
     @Nullable
     public KeyTokenSymbol<?> key() {
         return key;
     }
 
-    /**
-     * Return the keys to get, if operating on multiple keys.
-     */
     @Nullable
     public Collection<KeyTokenSymbol<?>> keys() {
         return keys;
     }
 
-    /**
-     * Return the record identifier, if operating on a single record.
-     */
     public long record() {
         return record;
     }
 
-    /**
-     * Return the record identifiers, if operating on multiple records.
-     */
     @Nullable
     public Collection<Long> records() {
         return records;
     }
 
-    /**
-     * Return the timestamp for historical get.
-     */
     @Nullable
     public TimestampSymbol timestamp() {
         return timestamp;
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/InventorySymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/InventorySymbol.java
new file mode 100644
index 00000000..1d257e93
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/InventorySymbol.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+/**
+ * A {@link CommandSymbol} that represents an INVENTORY command. T
+ */
+public class InventorySymbol implements CommandSymbol {
+
+    /**
+     * The singleton instance for this command since it takes no parameters.
+     */
+    public static final InventorySymbol INSTANCE = new InventorySymbol();
+
+    /**
+     * Private constructor to enforce singleton pattern.
+     */
+    private InventorySymbol() {/* no-op */}
+
+    @Override
+    public String type() {
+        return "INVENTORY";
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/JsonifySymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/JsonifySymbol.java
new file mode 100644
index 00000000..cd2e8723
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/JsonifySymbol.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a JSONIFY command.
+ */
+public class JsonifySymbol implements CommandSymbol {
+    private final Long record;
+    private final Collection<Long> records;
+    private final TimestampSymbol timestamp;
+    private final boolean identifier;
+
+    /**
+     * Construct a new instance for jsonifying a single record.
+     *
+     * @param record the record id
+     * @param identifier whether to include a special key for record id
+     */
+    public JsonifySymbol(long record, boolean identifier) {
+        this(record, null, null, identifier);
+    }
+
+    /**
+     * Construct a new instance for jsonifying multiple records.
+     *
+     * @param records collection of record ids
+     * @param identifier whether to include a special key for record ids
+     */
+    public JsonifySymbol(Collection<Long> records, boolean identifier) {
+        this(null, records, null, identifier);
+    }
+
+    /**
+     * Construct a new instance for jsonifying historical data.
+     *
+     * @param record single record id or {@code null} if using multiple records
+     * @param records collection of record ids or {@code null} if using single record
+     * @param timestamp the historical instant to use for data retrieval
+     * @param identifier whether to include a special key for record id(s)
+     */
+    public JsonifySymbol(@Nullable Long record, @Nullable Collection<Long> records,
+                         @Nullable TimestampSymbol timestamp, boolean identifier) {
+        this.record = record;
+        this.records = records;
+        this.timestamp = timestamp;
+        this.identifier = identifier;
+    }
+
+    @Override
+    public String type() {
+        return "JSONIFY";
+    }
+
+    /**
+     * Return the single record identifier if specified.
+     *
+     * @return the record id or {@code null} if using multiple records
+     */
+    @Nullable
+    public Long record() {
+        return record;
+    }
+
+    /**
+     * Return the collection of record identifiers if specified.
+     *
+     * @return the record ids or {@code null} if using single record
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+
+    /**
+     * Return the timestamp for historical data retrieval.
+     *
+     * @return the timestamp if specified, otherwise {@code null}
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+
+    /**
+     * Return whether to include record identifiers in JSON output.
+     *
+     * @return {@code true} if identifiers should be included
+     */
+    public boolean includeIdentifier() {
+        return identifier;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/NavigateSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/NavigateSymbol.java
new file mode 100644
index 00000000..218d1ec0
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/NavigateSymbol.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+import com.cinchapi.concourse.lang.BuildableState;
+
+/**
+ * A {@link CommandSymbol} that represents a NAVIGATE command.
+ */
+public class NavigateSymbol implements CommandSymbol {
+    private final Collection<KeyTokenSymbol<?>> keys;
+    private final Long record;
+    private final Collection<Long> records;
+    private final String ccl;
+    private final BuildableState criteria;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance for navigating from a single record.
+     *
+     * @param keys navigation keys
+     * @param record the starting record id
+     * @param timestamp optional timestamp for historical navigation
+     */
+    public NavigateSymbol(Collection<KeyTokenSymbol<?>> keys, long record,
+                          @Nullable TimestampSymbol timestamp) {
+        this(keys, record, null, null, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for navigating from multiple records.
+     *
+     * @param keys navigation keys
+     * @param records the starting record ids
+     * @param timestamp optional timestamp for historical navigation
+     */
+    public NavigateSymbol(Collection<KeyTokenSymbol<?>> keys, Collection<Long> records,
+                          @Nullable TimestampSymbol timestamp) {
+        this(keys, null, records, null, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for navigating from records matching criteria.
+     *
+     * @param keys navigation keys
+     * @param criteria the criteria for selecting starting records
+     * @param timestamp optional timestamp for historical navigation
+     */
+    public NavigateSymbol(Collection<KeyTokenSymbol<?>> keys, BuildableState criteria,
+                          @Nullable TimestampSymbol timestamp) {
+        this(keys, null, null, null, criteria, timestamp);
+    }
+
+    /**
+     * Construct a new instance for navigating from records matching CCL.
+     *
+     * @param keys navigation keys
+     * @param ccl the CCL for selecting starting records
+     * @param timestamp optional timestamp for historical navigation
+     */
+    public NavigateSymbol(Collection<KeyTokenSymbol<?>> keys, String ccl,
+                          @Nullable TimestampSymbol timestamp) {
+        this(keys, null, null, ccl, null, timestamp);
+    }
+
+    private NavigateSymbol(Collection<KeyTokenSymbol<?>> keys, @Nullable Long record,
+                           @Nullable Collection<Long> records, @Nullable String ccl,
+                           @Nullable BuildableState criteria, @Nullable TimestampSymbol timestamp) {
+        this.keys = keys;
+        this.record = record;
+        this.records = records;
+        this.ccl = ccl;
+        this.criteria = criteria;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "NAVIGATE";
+    }
+
+    /**
+     * Return the navigation keys.
+     *
+     * @return the collection of keys to navigate along
+     */
+    public Collection<KeyTokenSymbol<?>> keys() {
+        return keys;
+    }
+
+    /**
+     * Return the single record identifier if specified.
+     *
+     * @return the starting record id or {@code null} if using multiple records
+     */
+    @Nullable
+    public Long record() {
+        return record;
+    }
+
+    /**
+     * Return the collection of record identifiers if specified.
+     *
+     * @return the starting record ids or {@code null} if using single record
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+
+    /**
+     * Return the CCL query if specified.
+     *
+     * @return the CCL string or {@code null} if using record ids or criteria
+     */
+    @Nullable
+    public String ccl() {
+        return ccl;
+    }
+
+    /**
+     * Return the criteria if specified.
+     *
+     * @return the criteria or {@code null} if using record ids or CCL
+     */
+    @Nullable
+    public BuildableState criteria() {
+        return criteria;
+    }
+
+    /**
+     * Return the timestamp for historical navigation.
+     *
+     * @return the timestamp if specified, otherwise {@code null}
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/ReconcileSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/ReconcileSymbol.java
new file mode 100644
index 00000000..6bffad2d
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/ReconcileSymbol.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a RECONCILE command.
+ */
+public class ReconcileSymbol implements CommandSymbol {
+    private final KeyTokenSymbol<?> key;
+    private final long record;
+    private final Collection<ValueTokenSymbol<?>> values;
+
+    /**
+     * Construct a new instance.
+     *
+     * @param key the field name to reconcile
+     * @param record the record id
+     * @param values the collection of desired values
+     */
+    public ReconcileSymbol(KeyTokenSymbol<?> key, long record,
+                           Collection<ValueTokenSymbol<?>> values) {
+        this.key = key;
+        this.record = record;
+        this.values = values;
+    }
+
+    @Override
+    public String type() {
+        return "RECONCILE";
+    }
+
+    /**
+     * Return the key to reconcile.
+     *
+     * @return the field name
+     */
+    public KeyTokenSymbol<?> key() {
+        return key;
+    }
+
+    /**
+     * Return the record identifier.
+     *
+     * @return the record id
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the desired values.
+     *
+     * @return collection of values the field should contain
+     */
+    public Collection<ValueTokenSymbol<?>> values() {
+        return values;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java
index 55318729..45e2775d 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/RemoveSymbol.java
@@ -13,6 +13,8 @@
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
 import com.cinchapi.ccl.grammar.ValueTokenSymbol;
 
+import java.util.Collection;
+
 /**
  * A {@link CommandSymbol} that represents a REMOVE command.
  */
@@ -20,9 +22,11 @@ public class RemoveSymbol implements CommandSymbol {
     private final KeyTokenSymbol<?> key;
     private final ValueTokenSymbol<?> value;
     private final long record;
+    private final Collection<Long> records;
+    private final boolean isMultiRecord;
 
     /**
-     * Construct a new instance.
+     * Construct a new instance for single record removal.
      *
      * @param key the key to remove
      * @param value the value to remove, if specified
@@ -32,6 +36,23 @@ public RemoveSymbol(KeyTokenSymbol<?> key, @Nullable ValueTokenSymbol<?> value,
         this.key = key;
         this.value = value;
         this.record = record;
+        this.records = null;
+        this.isMultiRecord = false;
+    }
+
+    /**
+     * Construct a new instance for multiple record removal.
+     *
+     * @param key the key to remove
+     * @param value the value to remove, if specified
+     * @param records a collection of record identifiers
+     */
+    public RemoveSymbol(KeyTokenSymbol<?> key, @Nullable ValueTokenSymbol<?> value, Collection<Long> records) {
+        this.key = key;
+        this.value = value;
+        this.record = -1;
+        this.records = records;
+        this.isMultiRecord = true;
     }
 
     @Override
@@ -41,6 +62,8 @@ public String type() {
 
     /**
      * Return the key to remove.
+     *
+     * @return the key symbol
      */
     public KeyTokenSymbol<?> key() {
         return key;
@@ -48,6 +71,8 @@ public KeyTokenSymbol<?> key() {
 
     /**
      * Return the value to remove, if specified.
+     *
+     * @return the value symbol or null if not specified
      */
     @Nullable
     public ValueTokenSymbol<?> value() {
@@ -55,9 +80,31 @@ public ValueTokenSymbol<?> value() {
     }
 
     /**
-     * Return the record identifier.
+     * Return the record identifier for single record operations.
+     * Returns -1 if this is a multi-record operation.
+     *
+     * @return the record id
      */
     public long record() {
         return record;
     }
+
+    /**
+     * Return the collection of record identifiers for multi-record operations.
+     * Returns null if this is a single record operation.
+     *
+     * @return the collection of record ids
+     */
+    public Collection<Long> records() {
+        return records;
+    }
+
+    /**
+     * Indicates whether this is a multi-record operation.
+     *
+     * @return true if operating on multiple records, false otherwise
+     */
+    public boolean isMultiRecord() {
+        return isMultiRecord;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/ReviewSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/ReviewSymbol.java
new file mode 100644
index 00000000..aaa43b7a
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/ReviewSymbol.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a REVIEW command. T
+ */
+public class ReviewSymbol implements CommandSymbol {
+    private final KeyTokenSymbol<?> key;
+    private final long record;
+    private final TimestampSymbol start;
+    private final TimestampSymbol end;
+
+    /**
+     * Construct a new instance for reviewing all changes to a record.
+     *
+     * @param record the record id
+     */
+    public ReviewSymbol(long record) {
+        this(null, record, null, null);
+    }
+
+    /**
+     * Construct a new instance for reviewing all changes to a specific field.
+     *
+     * @param key the field name
+     * @param record the record id
+     */
+    public ReviewSymbol(KeyTokenSymbol<?> key, long record) {
+        this(key, record, null, null);
+    }
+
+    /**
+     * Construct a new instance for reviewing changes after a start time.
+     *
+     * @param key the field name if reviewing specific field
+     * @param record the record id
+     * @param start the inclusive start timestamp
+     */
+    public ReviewSymbol(@Nullable KeyTokenSymbol<?> key, long record,
+                        TimestampSymbol start) {
+        this(key, record, start, null);
+    }
+
+    /**
+     * Construct a new instance for reviewing changes in a time range.
+     *
+     * @param key the field name if reviewing specific field
+     * @param record the record id
+     * @param start the inclusive start timestamp
+     * @param end the non-inclusive end timestamp
+     */
+    public ReviewSymbol(@Nullable KeyTokenSymbol<?> key, long record,
+                        @Nullable TimestampSymbol start, @Nullable TimestampSymbol end) {
+        this.key = key;
+        this.record = record;
+        this.start = start;
+        this.end = end;
+    }
+
+    @Override
+    public String type() {
+        return "REVIEW";
+    }
+
+    /**
+     * Return the key to review if specified.
+     *
+     * @return the field name or {@code null} if reviewing entire record
+     */
+    @Nullable
+    public KeyTokenSymbol<?> key() {
+        return key;
+    }
+
+    /**
+     * Return the record identifier.
+     *
+     * @return the record id
+     */
+    public long record() {
+        return record;
+    }
+
+    /**
+     * Return the start timestamp if specified.
+     *
+     * @return the inclusive start timestamp or {@code null} if reviewing from beginning
+     */
+    @Nullable
+    public TimestampSymbol start() {
+        return start;
+    }
+
+    /**
+     * Return the end timestamp if specified.
+     *
+     * @return the non-inclusive end timestamp or {@code null} if reviewing to present
+     */
+    @Nullable
+    public TimestampSymbol end() {
+        return end;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java
index b436949d..a8fea3ae 100644
--- a/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/SelectSymbol.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2017 Cinchapi Inc.
+ * Copyright (c) 2013-2024 Cinchapi Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -9,30 +9,54 @@
  */
 package com.cinchapi.ccl.grammar.command;
 
+import java.util.Collection;
+import javax.annotation.Nullable;
 import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ExpressionSymbol;
 import com.cinchapi.ccl.grammar.TimestampSymbol;
-
-import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.OrderSymbol;
+import com.cinchapi.ccl.grammar.PageSymbol;
 
 /**
  * A {@link CommandSymbol} that represents a SELECT command.
  */
 public class SelectSymbol implements CommandSymbol {
-    private final KeyTokenSymbol<?> key;
-    private final long record;
+    private final Collection<KeyTokenSymbol<?>> keys;
+    private final Long record;
+    private final Collection<Long> records;
     private final TimestampSymbol timestamp;
 
     /**
-     * Construct a new instance.
-     *
-     * @param key the key to select
-     * @param record the record identifier
-     * @param timestamp optional timestamp for historical queries
+     * Construct a new instance for selecting from a single record.
      */
-    public SelectSymbol(KeyTokenSymbol<?> key, long record, @Nullable TimestampSymbol timestamp) {
-        this.key = key;
+    public SelectSymbol(@Nullable Collection<KeyTokenSymbol<?>> keys, long record,
+                        @Nullable TimestampSymbol timestamp) {
+        this.keys = keys;
         this.record = record;
+        this.records = null;
+        this.timestamp = timestamp;
+    }
+
+    /**
+     * Construct a new instance for selecting from multiple records.
+     */
+    public SelectSymbol(@Nullable Collection<KeyTokenSymbol<?>> keys, Collection<Long> records,
+                        @Nullable TimestampSymbol timestamp) {
+        this.keys = keys;
+        this.record = null;
+        this.records = records;
+        this.timestamp = timestamp;
+    }
+
+    /**
+     * Construct a new instance for expression-based selecting.
+     */
+    public SelectSymbol(@Nullable Collection<KeyTokenSymbol<?>> keys,
+                        @Nullable TimestampSymbol timestamp) {
+        this.keys = keys;
         this.timestamp = timestamp;
+        this.record = null;
+        this.records = null;
     }
 
     @Override
@@ -41,21 +65,31 @@ public String type() {
     }
 
     /**
-     * Return the key to select.
+     * Return the keys to select.
      */
-    public KeyTokenSymbol<?> key() {
-        return key;
+    @Nullable
+    public Collection<KeyTokenSymbol<?>> keys() {
+        return keys;
     }
 
     /**
-     * Return the record identifier.
+     * Return the record identifier if selecting from a single record.
      */
-    public long record() {
+    @Nullable
+    public Long record() {
         return record;
     }
 
     /**
-     * Return the timestamp for historical queries.
+     * Return the record identifiers if selecting from multiple records.
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+
+    /**
+     * Return the timestamp for historical select.
      */
     @Nullable
     public TimestampSymbol timestamp() {
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/TraceSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/TraceSymbol.java
new file mode 100644
index 00000000..48007b53
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/TraceSymbol.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import java.util.Collection;
+import javax.annotation.Nullable;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a TRACE command. This command locates and
+ * returns all incoming links to specified records.
+ * <p>
+ * The trace operation maps each record to another mapping from keys to all the records
+ * where those keys were stored as links to the specified record. This provides a way
+ * to find all references to particular records in the document-graph.
+ * </p>
+ */
+public class TraceSymbol implements CommandSymbol {
+    private final Long record;
+    private final Collection<Long> records;
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new instance for tracing links to a single record.
+     *
+     * @param record the record id
+     */
+    public TraceSymbol(long record) {
+        this(record, null, null);
+    }
+
+    /**
+     * Construct a new instance for tracing historical links to a single record.
+     *
+     * @param record the record id
+     * @param timestamp the historical instant to trace
+     */
+    public TraceSymbol(long record, @Nullable TimestampSymbol timestamp) {
+        this(record, null, timestamp);
+    }
+
+    /**
+     * Construct a new instance for tracing links to multiple records.
+     *
+     * @param records collection of record ids
+     */
+    public TraceSymbol(Collection<Long> records) {
+        this(null, records, null);
+    }
+
+    /**
+     * Construct a new instance for tracing historical links to multiple records.
+     *
+     * @param records collection of record ids
+     * @param timestamp the historical instant to trace
+     */
+    public TraceSymbol(Collection<Long> records, @Nullable TimestampSymbol timestamp) {
+        this(null, records, timestamp);
+    }
+
+    /**
+     * Private constructor for all trace scenarios.
+     *
+     * @param record single record id or null if using multiple records
+     * @param records collection of record ids or null if using single record
+     * @param timestamp optional historical instant to trace
+     */
+    private TraceSymbol(@Nullable Long record, @Nullable Collection<Long> records,
+                        @Nullable TimestampSymbol timestamp) {
+        this.record = record;
+        this.records = records;
+        this.timestamp = timestamp;
+    }
+
+    @Override
+    public String type() {
+        return "TRACE";
+    }
+
+    /**
+     * Return the single record identifier if specified.
+     *
+     * @return the record id or {@code null} if tracing multiple records
+     */
+    @Nullable
+    public Long record() {
+        return record;
+    }
+
+    /**
+     * Return the collection of record identifiers if specified.
+     *
+     * @return the record ids or {@code null} if tracing single record
+     */
+    @Nullable
+    public Collection<Long> records() {
+        return records;
+    }
+
+    /**
+     * Return the timestamp for historical tracing.
+     *
+     * @return the timestamp if specified, otherwise {@code null}
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/syntax/CommandTree.java b/src/main/java/com/cinchapi/ccl/syntax/CommandTree.java
index 42db4dfa..f885b69e 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/CommandTree.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/CommandTree.java
@@ -30,7 +30,6 @@
  * parsing a command.
  */
 public class CommandTree extends BaseAbstractSyntaxTree {
-
     private CommandSymbol command;
     private ConditionTree conditionTree;
     private PageTree pageTree;
diff --git a/src/main/java/com/cinchapi/ccl/syntax/Visitor.java b/src/main/java/com/cinchapi/ccl/syntax/Visitor.java
index 3274f601..30ab070d 100644
--- a/src/main/java/com/cinchapi/ccl/syntax/Visitor.java
+++ b/src/main/java/com/cinchapi/ccl/syntax/Visitor.java
@@ -22,9 +22,6 @@
  * method must be called with a {@link Visitor} as a parameter.
  */
 public interface Visitor<T> {
-
-    public T visit(CommandTree tree, Object... data);
-
     public default T visit(ConditionTree tree, Object... data) {
         if(tree instanceof ConjunctionTree) {
             return visit((ConjunctionTree) tree, data);
@@ -46,4 +43,6 @@ else if(tree instanceof ExpressionTree) {
     public T visit(PageTree tree, Object... data);
 
     public T visit(FunctionTree tree, Object... data);
+
+    public T visit(CommandTree tree, Object... data);
 }
diff --git a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
index 615e6916..0a14dd03 100644
--- a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
+++ b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
@@ -2253,107 +2253,8 @@ public void testIndexFunctionWithTimestampAbstractSyntaxTree() {
     }
 
     @Test
-    public void testAddCommand() {
-        String ccl = "add name as \"John Doe\" in 1";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        AddSymbol command = (AddSymbol) rootNode.root();
-
-        Assert.assertEquals("ADD", command.type());
-        Assert.assertEquals("name", command.key().toString());
-        Assert.assertEquals("\"John Doe\"", command.value().toString());
-        Assert.assertEquals(1L, command.record());
-    }
-
-    @Test
-    public void testSetCommand() {
-        String ccl = "set age as 25 in 1";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        SetSymbol command = (SetSymbol) rootNode.root();
-
-        Assert.assertEquals("SET", command.type());
-        Assert.assertEquals("age", command.key().toString());
-        Assert.assertEquals("25", command.value().toString());
-        Assert.assertEquals(1L, command.record());
-    }
-
-    @Test
-    public void testRemoveCommand() {
-        String ccl = "remove name from 1";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        RemoveSymbol command = (RemoveSymbol) rootNode.root();
-
-        Assert.assertEquals("REMOVE", command.type());
-        Assert.assertEquals("name", command.key().toString());
-        Assert.assertNull(command.value());
-        Assert.assertEquals(1L, command.record());
-    }
-
-    @Test
-    public void testRemoveValueCommand() {
-        String ccl = "remove name as \"John Doe\" from 1";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        RemoveSymbol command = (RemoveSymbol) rootNode.root();
-
-        Assert.assertEquals("REMOVE", command.type());
-        Assert.assertEquals("name", command.key().toString());
-        Assert.assertEquals("\"John Doe\"", command.value().toString());
-        Assert.assertEquals(1L, command.record());
-    }
-
-    @Test
-    public void testClearCommand() {
-        String ccl = "clear name from 1";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        ClearSymbol command = (ClearSymbol) rootNode.root();
-
-        Assert.assertEquals("CLEAR", command.type());
-        Assert.assertEquals("name", command.key().toString());
-        Assert.assertEquals(1L, command.record());
-    }
-
-    @Test
-    public void testClearMultipleKeysCommand() {
-        String ccl = "clear [name, age] from 1";
+    public void testLinkCommand() {
+        String ccl = "link friends from 1 to 2";
 
         // Generate tree
         Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
@@ -2363,38 +2264,35 @@ public void testClearMultipleKeysCommand() {
         // Root node
         Assert.assertTrue(tree instanceof CommandTree);
         CommandTree rootNode = (CommandTree) tree;
-        ClearSymbol command = (ClearSymbol) rootNode.root();
 
-        Assert.assertEquals("CLEAR", command.type());
-        Assert.assertNull(command.key());
-        Assert.assertEquals(2, command.keys().size());
-        Assert.assertEquals(1L, command.record());
+        LinkSymbol linkSymbol = (LinkSymbol) rootNode.root();
+        Assert.assertEquals("friends", linkSymbol.key().toString());
+        Assert.assertEquals(1L, linkSymbol.source());
+        Assert.assertTrue(linkSymbol.destinations().contains(2L));
     }
 
     @Test
-    public void testVerifyAndSwapCommand() {
-        String ccl = "verifyAndSwap name as John in 1 with Jane";
+    public void testVerifyOrSetCommandTokenize() {
+        String ccl = "verifyOrSet name as \"John Doe\" in 1";
 
-        // Generate tree
+        // Generate queue
         Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
                 COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
 
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        VerifyAndSwapSymbol command = (VerifyAndSwapSymbol) rootNode.root();
+        // Verify the command symbol
+        CommandTree commandTree = (CommandTree) ast;
+        VerifyOrSetSymbol verifyOrSetSymbol = (VerifyOrSetSymbol) commandTree.root();
 
-        Assert.assertEquals("VERIFY_AND_SWAP", command.type());
-        Assert.assertEquals("name", command.key().toString());
-        Assert.assertEquals("John", command.expected().toString());
-        Assert.assertEquals("Jane", command.replacement().toString());
-        Assert.assertEquals(1L, command.record());
+        Assert.assertEquals("name", verifyOrSetSymbol.key().toString());
+        Assert.assertEquals("\"John Doe\"", verifyOrSetSymbol.value().toString());
+        Assert.assertEquals(1L, verifyOrSetSymbol.record());
+        Assert.assertEquals("VERIFY_OR_SET", verifyOrSetSymbol.type());
     }
 
     @Test
-    public void testVerifyOrSetCommand() {
-        String ccl = "verifyOrSet name as John in 1";
+    public void testChronologizeCommand() {
+        String ccl = "chronologize location in 5 at \"2024-01-01\" at \"2024-02-01\"";
 
         // Generate tree
         Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
@@ -2404,182 +2302,152 @@ public void testVerifyOrSetCommand() {
         // Root node
         Assert.assertTrue(tree instanceof CommandTree);
         CommandTree rootNode = (CommandTree) tree;
-        VerifyOrSetSymbol command = (VerifyOrSetSymbol) rootNode.root();
-
-        Assert.assertEquals("VERIFY_OR_SET", command.type());
-        Assert.assertEquals("name", command.key().toString());
-        Assert.assertEquals("John", command.value().toString());
-        Assert.assertEquals(1L, command.record());
-    }
 
-    @Test
-    public void testInsertCommand() {
-        String ccl = "insert \"{'name':'John'}\" in 1";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
+        ChronologizeSymbol chronologizeSymbol = (ChronologizeSymbol) rootNode.root();
+        Assert.assertEquals("location", chronologizeSymbol.key().toString());
+        Assert.assertEquals(5L, chronologizeSymbol.record());
 
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        InsertSymbol command = (InsertSymbol) rootNode.root();
+        // Validate timestamps
+        Assert.assertEquals(
+                TimeUnit.DAYS.convert(
+                        chronologizeSymbol.start().timestamp(),
+                        TimeUnit.MICROSECONDS),
+                TimeUnit.DAYS.convert(
+                        NaturalLanguage.parseMicros("2024-01-01"),
+                        TimeUnit.MICROSECONDS)
+        );
 
-        Assert.assertEquals("INSERT", command.type());
-        Assert.assertEquals("\"{'name':'John'}\"", command.json());
-        Assert.assertEquals(1L, (long)command.record());
+        Assert.assertEquals(
+                TimeUnit.DAYS.convert(
+                        chronologizeSymbol.end().timestamp(),
+                        TimeUnit.MICROSECONDS),
+                TimeUnit.DAYS.convert(
+                        NaturalLanguage.parseMicros("2024-02-01"),
+                        TimeUnit.MICROSECONDS)
+        );
     }
 
     @Test
-    public void testLinkCommand() {
-        String ccl = "link friends from 1 to 2";
+    public void testSearchCommandTokenize() {
+        String ccl = "search email for \"john@example.com\"";
 
-        // Generate tree
+        // Generate queue
         Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
                 COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
+        AbstractSyntaxTree ast = compiler.parse(ccl);
+        List<Symbol> tokens = compiler.tokenize(ast);
 
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        LinkSymbol command = (LinkSymbol) rootNode.root();
+        // Verify the command symbol
+        CommandTree commandTree = (CommandTree) ast;
+        SearchSymbol searchSymbol = (SearchSymbol) commandTree.root();
 
-        Assert.assertEquals("LINK", command.type());
-        Assert.assertEquals("friends", command.key().toString());
-        Assert.assertEquals(1L, command.source());
-        Assert.assertEquals(1, command.destinations().size());
-        Assert.assertTrue(command.destinations().contains(2L));
+        Assert.assertEquals("email", searchSymbol.key().toString());
+        Assert.assertEquals("\"john@example.com\"", searchSymbol.query());
+        Assert.assertEquals("SEARCH", searchSymbol.type());
     }
 
     @Test
-    public void testUnlinkCommand() {
-        String ccl = "unlink friends from 1 to [2,3]";
+    public void testReproIX5A() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("_")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value("org.internx.model.data.user.Student"))
+                .and()
+                .group(Criteria.where()
+                        .group(Criteria.where().key("group").operator(
+                                com.cinchapi.concourse.thrift.Operator.LIKE)
+                                .value("%Accounting And Business/management%"))
+                        .or()
+                        .group(Criteria.where().key("major").operator(
+                                com.cinchapi.concourse.thrift.Operator.LIKE)
+                                .value("%accounting and business/management%")));
 
         // Generate tree
         Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
                 COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
-
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        UnlinkSymbol command = (UnlinkSymbol) rootNode.root();
-
-        Assert.assertEquals("UNLINK", command.type());
-        Assert.assertEquals("friends", command.key().toString());
-        Assert.assertEquals(1L, command.source());
-        Assert.assertEquals(2, command.destinations().size());
-        Assert.assertTrue(command.destinations().contains(2L));
-        Assert.assertTrue(command.destinations().contains(3L));
+        AbstractSyntaxTree ast = compiler.parse(criteria.ccl());
+        List<Symbol> tokens = compiler.tokenize(ast);
+        tokens.forEach(token -> {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(String.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        });
     }
 
     @Test
-    public void testSelectCommand() {
-        String ccl = "select age from 1";
+    public void testFindWithOrderAndPage() {
+        String ccl = "find age > 25 order by name ASC, age DESC page 1 size 10";
 
-        // Generate tree
         Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
                 COMPILER_PARSE_OPERATOR_FUNCTION);
         AbstractSyntaxTree tree = compiler.parse(ccl);
 
-        // Root node
+        // Validate Condition Tree
         Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        SelectSymbol command = (SelectSymbol) rootNode.root();
+        CommandTree commandTree = (CommandTree) tree;
 
-        Assert.assertEquals("SELECT", command.type());
-        Assert.assertEquals("age", command.key().toString());
-        Assert.assertEquals(1L, command.record());
-        Assert.assertNull(command.timestamp());
-    }
-
-    @Test
-    public void testSelectCommandWithTimestamp() {
-        String ccl = "select age from 1 as of \"yesterday\"";
+        // Validate Condition
+        ExpressionSymbol expression = (ExpressionSymbol) commandTree.conditionTree().root();
+        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertEquals("25", expression.values().get(0).toString());
 
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
+        // Validate Order
+        OrderSymbol order = (OrderSymbol) commandTree.orderTree().root();
+        Assert.assertEquals(2, order.components().size());
+        Assert.assertEquals("name", order.components().get(0).key().toString());
+        Assert.assertEquals(DirectionSymbol.ASCENDING, order.components().get(0).direction());
+        Assert.assertEquals("age", order.components().get(1).key().toString());
+        Assert.assertEquals(DirectionSymbol.DESCENDING, order.components().get(1).direction());
 
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        SelectSymbol command = (SelectSymbol) rootNode.root();
-
-        Assert.assertEquals("SELECT", command.type());
-        Assert.assertEquals("age", command.key().toString());
-        Assert.assertEquals(1L, command.record());
-        Assert.assertNotNull(command.timestamp());
+        // Validate Page
+        PageSymbol page = (PageSymbol) commandTree.pageTree().root();
+        Assert.assertEquals(1, page.offset());
+        Assert.assertEquals(10, page.limit());
     }
 
     @Test
-    public void testRevertCommand() {
-        String ccl = "revert name in 1 as of yesterday";
+    public void testGetWithOrderTimestampAndPage() {
+        String ccl = "get [name, age] where salary > 50000 order by age at \"2024-01-01\" page 2 size 5";
 
-        // Generate tree
         Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
                 COMPILER_PARSE_OPERATOR_FUNCTION);
         AbstractSyntaxTree tree = compiler.parse(ccl);
 
-        // Root node
+        // Validate Condition Tree
         Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        RevertSymbol command = (RevertSymbol) rootNode.root();
-
-        Assert.assertEquals("REVERT", command.type());
-        Assert.assertEquals("name", command.key().toString());
-        Assert.assertEquals(1L, command.record());
-        Assert.assertNotNull(command.timestamp());
-    }
+        CommandTree commandTree = (CommandTree) tree;
 
-    @Test
-    public void testSearchCommand() {
-        String ccl = "search name for \"John\"";
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree tree = compiler.parse(ccl);
+        // Validate Keys
+        GetSymbol getSymbol = (GetSymbol) commandTree.root();
+        Assert.assertEquals(2, getSymbol.keys().size());
 
-        // Root node
-        Assert.assertTrue(tree instanceof CommandTree);
-        CommandTree rootNode = (CommandTree) tree;
-        SearchSymbol command = (SearchSymbol) rootNode.root();
+        // Validate Condition
+        ExpressionSymbol expression = (ExpressionSymbol) commandTree.conditionTree().root();
+        Assert.assertEquals("salary", expression.key().toString());
+        Assert.assertEquals(">", expression.operator().toString());
+        Assert.assertEquals("50000", expression.values().get(0).toString());
 
-        Assert.assertEquals("SEARCH", command.type());
-        Assert.assertEquals("name", command.key().toString());
-        Assert.assertEquals("\"John\"", command.query());
-    }
+        // Validate Order
+        OrderSymbol order = (OrderSymbol) commandTree.orderTree().root();
+        Assert.assertEquals(1, order.components().size());
+        Assert.assertEquals("age", order.components().get(0).key().toString());
 
-    @Test
-    public void testReproIX5A() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("_")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value("org.internx.model.data.user.Student"))
-                .and()
-                .group(Criteria.where()
-                        .group(Criteria.where().key("group").operator(
-                                com.cinchapi.concourse.thrift.Operator.LIKE)
-                                .value("%Accounting And Business/management%"))
-                        .or()
-                        .group(Criteria.where().key("major").operator(
-                                com.cinchapi.concourse.thrift.Operator.LIKE)
-                                .value("%accounting and business/management%")));
+        // Validate Timestamp
+        Assert.assertEquals(
+                TimeUnit.DAYS.convert(
+                        order.components().get(0).timestamp().timestamp(),
+                        TimeUnit.MICROSECONDS),
+                TimeUnit.DAYS.convert(
+                        NaturalLanguage.parseMicros("2024-01-01"),
+                        TimeUnit.MICROSECONDS)
+        );
 
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(criteria.ccl());
-        List<Symbol> tokens = compiler.tokenize(ast);
-        tokens.forEach(token -> {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(String.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        });
+        // Validate Page
+        PageSymbol page = (PageSymbol) commandTree.pageTree().root();
+        Assert.assertEquals(2, page.offset());
+        Assert.assertEquals(5, page.limit());
     }
 
     @Test
diff --git a/src/test/java/com/cinchapi/ccl/GrammarTest.java b/src/test/java/com/cinchapi/ccl/GrammarTest.java
index 2d65008f..ad009624 100644
--- a/src/test/java/com/cinchapi/ccl/GrammarTest.java
+++ b/src/test/java/com/cinchapi/ccl/GrammarTest.java
@@ -748,8 +748,495 @@ public void testIndexFunctionWithTimestamp() throws UnsupportedEncodingException
     }
 
     @Test
-    public void testAddCommand() throws UnsupportedEncodingException, ParseException {
+    public void testAbortCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "abort";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testAddSingleRecordCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "add name as \"John Doe\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testAddSpecificRecordCommand() throws UnsupportedEncodingException, ParseException {
         String ccl = "add name as \"John Doe\" in 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testAddMultipleRecordsCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "add name as \"John Doe\" in [1, 2, 3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidAddCommandMissingValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "add name as";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidAddCommandMissingAs() throws UnsupportedEncodingException, ParseException {
+        String ccl = "add name \"John Doe\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidAddCommandMalformedRecordList() throws UnsupportedEncodingException, ParseException {
+        String ccl = "add name as \"John Doe\" in [1, 2,]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testAddNumericValueCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "add age as 25";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testAddCompoundValueCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "add full_name as \"John Q. Doe\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testBrowseSingleKeyCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse [name]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testBrowseMultipleKeysCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse [name, age, location]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testBrowseSingleKeyWithTimestampCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse [name] at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testBrowseMultipleKeysWithTimestampCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse [name, age] at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testBrowseWithNaturalLanguageTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse [name] at \"two weeks ago\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testBrowseWithMicrosTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse [name] at 1704067200000000"; // Unix timestamp in microseconds
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidBrowseCommandMissingBrackets() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse name";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidBrowseCommandEmptyKeyList() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse []";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidBrowseCommandMalformedKeyList() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse [name,,age]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidBrowseCommandMalformedTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "browse [name] at at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(
+                StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testChronologizeBasicCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "chronologize name in 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testChronologizeWithStartTime() throws UnsupportedEncodingException, ParseException {
+        String ccl = "chronologize name in 1 at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testChronologizeWithStartAndEndTime() throws UnsupportedEncodingException, ParseException {
+        String ccl = "chronologize name in 1 at \"2024-01-01\" at \"2024-02-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testChronologizeWithNaturalLanguageTime() throws UnsupportedEncodingException, ParseException {
+        String ccl = "chronologize name in 1 at \"two weeks ago\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testClearSingleRecordCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "clear 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testClearMultipleRecordsCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "clear [1, 2, 3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testClearSingleKeyFromRecord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "clear name from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testClearMultipleKeysFromRecord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "clear [name, age] from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testClearKeysFromMultipleRecords() throws UnsupportedEncodingException, ParseException {
+        String ccl = "clear [name, age] from [1, 2, 3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testClearSingleKeyFromMultipleRecords() throws UnsupportedEncodingException, ParseException {
+        String ccl = "clear name from [1, 2, 3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidChronologizeNoRecord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "chronologize name";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidClearNoTarget() throws UnsupportedEncodingException, ParseException {
+        String ccl = "clear";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testCommitCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "commit";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidCommitWithArguments() throws UnsupportedEncodingException, ParseException {
+        String ccl = "commit 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidCommitWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "commit at \"now\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDescribeBasic() throws UnsupportedEncodingException, ParseException {
+        String ccl = "describe";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDescribeSingleRecord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "describe 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDescribeMultipleRecords() throws UnsupportedEncodingException, ParseException {
+        String ccl = "describe [1, 2, 3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDescribeWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "describe 1 at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDescribeMultipleRecordsWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "describe [1, 2, 3] at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDiffSingleRecordWithStart() throws UnsupportedEncodingException, ParseException {
+        String ccl = "diff 1 at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDiffSingleRecordWithStartAndEnd() throws UnsupportedEncodingException, ParseException {
+        String ccl = "diff 1 at \"2024-01-01\" at \"2024-02-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDiffKeyRecordWithStart() throws UnsupportedEncodingException, ParseException {
+        String ccl = "diff name in 1 at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDiffKeyRecordWithStartAndEnd() throws UnsupportedEncodingException, ParseException {
+        String ccl = "diff name in 1 at \"2024-01-01\" at \"2024-02-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDiffKeyWithStart() throws UnsupportedEncodingException, ParseException {
+        String ccl = "diff name at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testDiffKeyWithStartAndEnd() throws UnsupportedEncodingException, ParseException {
+        String ccl = "diff name at \"2024-01-01\" at \"2024-02-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidDiffNoTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "diff 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidExitWithParameters() throws UnsupportedEncodingException, ParseException {
+        String ccl = "exit now";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testBasicFind() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find name = \"John\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFindWithOrder() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find name = \"John\" order by age";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFindWithOrderAndPage() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find name = \"John\" order by age page 1 size 10";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFindWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find name = \"John\" at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFindWithComplexOperator() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find age >< 25 35";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFindWithComplexCriteria() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find (age > 25 and name = \"John\") or (age < 20 and city = \"NYC\")";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -757,8 +1244,8 @@ public void testAddCommand() throws UnsupportedEncodingException, ParseException
     }
 
     @Test
-    public void testSetCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "set age as 25 in 1";
+    public void testFindWithRegex() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find name regex (?i:john.*)";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -766,8 +1253,8 @@ public void testSetCommand() throws UnsupportedEncodingException, ParseException
     }
 
     @Test
-    public void testRemoveCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "remove name from 1";
+    public void testFindWithMultipleOrderCriteria() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find age > 25 order by name ASC, age DESC";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -775,8 +1262,35 @@ public void testRemoveCommand() throws UnsupportedEncodingException, ParseExcept
     }
 
     @Test
-    public void testClearCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "clear [name, age] from 1";
+    public void testFindWithFunction() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find age > avg(age)";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidFindIncompleteCriteria() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find name";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidFindOperator() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find age >>>> 25";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void testInvalidFindMalformedTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "find age > 25 at invalid-timestamp";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -784,8 +1298,8 @@ public void testClearCommand() throws UnsupportedEncodingException, ParseExcepti
     }
 
     @Test
-    public void testInsertCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "insert \"{'name':'John'}\" into 1";
+    public void testGetSingleKeyRecord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get name from 1";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -793,8 +1307,8 @@ public void testInsertCommand() throws UnsupportedEncodingException, ParseExcept
     }
 
     @Test
-    public void testVerifyAndSwapCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "verifyAndSwap name as \"John\" in 1 with \"Jane\"";
+    public void testGetMultipleKeysFromRecord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get [name, age] from 1";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -802,8 +1316,8 @@ public void testVerifyAndSwapCommand() throws UnsupportedEncodingException, Pars
     }
 
     @Test
-    public void testVerifyOrSetCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "verifyOrSet name as \"John\" in 1";
+    public void testGetKeysFromRecordsWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get [name, age] from [1, 2, 3] at \"2024-01-01\"";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -811,8 +1325,8 @@ public void testVerifyOrSetCommand() throws UnsupportedEncodingException, ParseE
     }
 
     @Test
-    public void testLinkCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "link friends from 1 to [2,3]";
+    public void testGetKeysWithCriteria() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get [name, age] where age > 25";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -820,8 +1334,26 @@ public void testLinkCommand() throws UnsupportedEncodingException, ParseExceptio
     }
 
     @Test
-    public void testUnlinkCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "unlink friends from 1 to [2,3]";
+    public void testGetWithCriteriaAndOrder() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get [name, age] where age > 25 order by age DESC";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testGetWithCriteriaAndPagination() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get [name, age] where age > 25 page 1 size 10";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testGetWithComplexCriteria() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get [name, age, city] where (age > 25 and city = \"NYC\") or (age < 20 and city = \"SF\")";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -829,8 +1361,35 @@ public void testUnlinkCommand() throws UnsupportedEncodingException, ParseExcept
     }
 
     @Test
-    public void testSelectCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "select age from 1";
+    public void testGetWithTimestampAndOrder() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get [name, age] where age > 25 at \"2024-01-01\" order by age ASC";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidGetNoKeys() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidGetMalformedKeys() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get [name,,age] from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidGetMissingFrom() throws UnsupportedEncodingException, ParseException {
+        String ccl = "get [name, age] 1";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -838,8 +1397,8 @@ public void testSelectCommand() throws UnsupportedEncodingException, ParseExcept
     }
 
     @Test
-    public void testSelectCommandWithTimestamp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "select age from 1 as of \"yesterday\"";
+    public void testBasicInsert() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert \"{'name': 'John', 'age': 25}\"";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -847,8 +1406,8 @@ public void testSelectCommandWithTimestamp() throws UnsupportedEncodingException
     }
 
     @Test
-    public void testFetchCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "fetch [name, age] from 1";
+    public void testInsertIntoSpecificRecord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert \"{'name': 'John', 'age': 25}\" in 1";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -856,8 +1415,8 @@ public void testFetchCommand() throws UnsupportedEncodingException, ParseExcepti
     }
 
     @Test
-    public void testGetCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "get age from [1,2,3]";
+    public void testInsertIntoMultipleRecords() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert \"{'name': 'John', 'age': 25}\" in [1, 2, 3]";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -865,8 +1424,152 @@ public void testGetCommand() throws UnsupportedEncodingException, ParseException
     }
 
     @Test
-    public void testDescribeCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "describe 1";
+    public void testInsertComplexJson() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert \"{'name': 'John', 'age': 25, 'skills': ['java', 'python'], 'active': true}\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testInsertArrayOfObjects() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert \"[{'name': 'John', 'age': 25}, {'name': 'Jane', 'age': 30}]\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testInventory() throws UnsupportedEncodingException, ParseException {
+        String ccl = "inventory";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidInsertMalformedJson() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert \"{name: John, age: 25\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidInsertNoJson() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert in 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidInsertMalformedRecordList() throws UnsupportedEncodingException, ParseException {
+        String ccl = "insert \"{'name': 'John'}\" in [1,,2]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testNavigateSingleKey() throws UnsupportedEncodingException, ParseException {
+        String ccl = "navigate [user.name] from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testNavigateMultipleKeys() throws UnsupportedEncodingException, ParseException {
+        String ccl = "navigate [user.name, user.profile.age] from [1, 2, 3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testNavigateWithCriteria() throws UnsupportedEncodingException, ParseException {
+        String ccl = "navigate [user.friends] where age > 25";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testNavigateWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "navigate [user.profile] from 1 at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testNavigateComplexPath() throws UnsupportedEncodingException, ParseException {
+        String ccl = "navigate [user.profile.friends.contacts.email] from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidNavigateNoKeys() throws UnsupportedEncodingException, ParseException {
+        String ccl = "navigate from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidNavigateMalformedPath() throws UnsupportedEncodingException, ParseException {
+        String ccl = "navigate [user..name] from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidNavigateEmptyKey() throws UnsupportedEncodingException, ParseException {
+        String ccl = "navigate [] from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testRemoveSingleValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "remove name as \"John\" from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testRemoveFromMultipleRecords() throws UnsupportedEncodingException, ParseException {
+        String ccl = "remove name as \"John\" from [1, 2, 3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testRevertSingleKey() throws UnsupportedEncodingException, ParseException {
+        String ccl = "revert [name] in 1 at \"2024-01-01\"";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -874,8 +1577,8 @@ public void testDescribeCommand() throws UnsupportedEncodingException, ParseExce
     }
 
     @Test
-    public void testDescribeCommandWithTimestamp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "describe 1 as of \"yesterday\"";
+    public void testRevertMultipleKeys() throws UnsupportedEncodingException, ParseException {
+        String ccl = "revert [name, age] in [1, 2, 3] at \"2024-01-01\"";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -883,8 +1586,17 @@ public void testDescribeCommandWithTimestamp() throws UnsupportedEncodingExcepti
     }
 
     @Test
-    public void testAuditCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "audit name from 1";
+    public void testReviewBasic() throws UnsupportedEncodingException, ParseException {
+        String ccl = "review 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testReviewWithTimeRange() throws UnsupportedEncodingException, ParseException {
+        String ccl = "review name in 1 at \"2024-01-01\" at \"2024-02-01\"";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -900,6 +1612,51 @@ public void testSearchCommand() throws UnsupportedEncodingException, ParseExcept
         grammar.generateAST();
     }
 
+    @Test
+    public void testSelectBasic() throws UnsupportedEncodingException, ParseException {
+        String ccl = "select [name, age] from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testSelectWithCriteria() throws UnsupportedEncodingException, ParseException {
+        String ccl = "select [name, age] where age > 25";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testSelectWithTimestampAndOrder() throws UnsupportedEncodingException, ParseException {
+        String ccl = "select [name, age] where age > 25 at \"2024-01-01\" order by age DESC";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidRevertNoTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "revert [name] in 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidSelectMissingKeys() throws UnsupportedEncodingException, ParseException {
+        String ccl = "select from 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
     @Test
     public void testStageCommand() throws UnsupportedEncodingException, ParseException {
         String ccl = "stage";
@@ -909,9 +1666,18 @@ public void testStageCommand() throws UnsupportedEncodingException, ParseExcepti
         grammar.generateAST();
     }
 
+    @Test(expected = ParseException.class)
+    public void testInvalidStageWithArguments() throws UnsupportedEncodingException, ParseException {
+        String ccl = "stage data";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
     @Test
-    public void testCommitCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "commit";
+    public void testUnlinkCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "unlink friends from 1 to 2";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -919,8 +1685,8 @@ public void testCommitCommand() throws UnsupportedEncodingException, ParseExcept
     }
 
     @Test
-    public void testAbortCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "abort";
+    public void testUnlinkMultipleDestinations() throws UnsupportedEncodingException, ParseException {
+        String ccl = "unlink friends from 1 to [2, 3, 4]";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -928,17 +1694,35 @@ public void testAbortCommand() throws UnsupportedEncodingException, ParseExcepti
     }
 
     @Test
-    public void testRevertCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "revert name in 1 as of yesterday";
+    public void testVerifyCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "verify name as \"John\" in 1";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
         grammar.generateAST();
     }
 
-    @Test(expected = ParseException.class)
-    public void testInvalidAddCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "add name in 1"; // Missing "as" keyword
+    @Test
+    public void testVerifyWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "verify name as \"John\" in 1 at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testVerifyAndSwapCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "verifyAndSwap name as \"John\" in 1 with \"Jane\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testVerifyOrSetCommand() throws UnsupportedEncodingException, ParseException {
+        String ccl = "verifyOrSet name as \"John\" in 1";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -946,8 +1730,8 @@ public void testInvalidAddCommand() throws UnsupportedEncodingException, ParseEx
     }
 
     @Test(expected = ParseException.class)
-    public void testInvalidInsertCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "insert into 1"; // Missing JSON data
+    public void testInvalidUnlinkMissingDestination() throws UnsupportedEncodingException, ParseException {
+        String ccl = "unlink friends from 1";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -955,14 +1739,22 @@ public void testInvalidInsertCommand() throws UnsupportedEncodingException, Pars
     }
 
     @Test(expected = ParseException.class)
-    public void testInvalidLinkCommand() throws UnsupportedEncodingException, ParseException {
-        String ccl = "link friends from 1"; // Missing destination
+    public void testInvalidVerifyNoValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "verify name in 1";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
         grammar.generateAST();
     }
 
+    @Test(expected = ParseException.class)
+    public void testInvalidVerifyAndSwapMissingReplacement() throws UnsupportedEncodingException, ParseException {
+        String ccl = "verifyAndSwap name as \"John\" in 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
     /**
      * Constants
      */

From 160125a226c72bce168e1e214bff8306049c01a1 Mon Sep 17 00:00:00 2001
From: Javier Lores <lores.javier@gmail.com>
Date: Tue, 11 Feb 2025 07:37:11 -0500
Subject: [PATCH 9/9] added missing commands and fixed bugs

---
 grammar/grammar.jjt                           |  32 +-
 .../java/com/cinchapi/ccl/CompilerJavaCC.java |  20 +-
 .../com/cinchapi/ccl/generated/Grammar.java   | 860 ++++++++--------
 .../ccl/generated/GrammarConstants.java       | 152 +--
 .../ccl/generated/GrammarTokenManager.java    | 936 ++++++++++--------
 .../ccl/grammar/command/FindOrAddSymbol.java  |  77 ++
 .../grammar/command/FindOrInsertSymbol.java   |  78 ++
 .../cinchapi/ccl/CompilerJavaCCLogicTest.java | 124 +--
 .../java/com/cinchapi/ccl/GrammarTest.java    | 118 ++-
 9 files changed, 1411 insertions(+), 986 deletions(-)
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/FindOrAddSymbol.java
 create mode 100644 src/main/java/com/cinchapi/ccl/grammar/command/FindOrInsertSymbol.java

diff --git a/grammar/grammar.jjt b/grammar/grammar.jjt
index 9c2db43a..fe9abd6f 100644
--- a/grammar/grammar.jjt
+++ b/grammar/grammar.jjt
@@ -145,6 +145,8 @@ TOKEN [IGNORE_CASE] : {
 | < SELECT: "select" >
 | < GET: "get" >
 | < FIND: "find" >
+| < FIND_OR_ADD: "findOrAdd" >
+| < FIND_OR_INSERT: "findOrInsert" >
 | < DESCRIBE: "describe" >
 | < VERIFY: "verify" >
 | < SEARCH: "search" >
@@ -1004,6 +1006,10 @@ CommandSymbol QueryOperations() : {
         cmd = GetCommand()
       |
         cmd = FindCommand()
+      |
+        cmd = FindOrAddCommand()
+      |
+        cmd = FindOrInsertCommand()
       |
         cmd = DescribeCommand()
       |
@@ -1116,6 +1122,27 @@ CommandSymbol FindCommand() : {
     }
 }
 
+CommandSymbol FindOrAddCommand() : {
+    KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
+}
+{
+    <FIND_OR_ADD> key=Key() <AS> value=UnaryValue()
+    { return new FindOrAddSymbol(key, value); }
+}
+
+CommandSymbol FindOrInsertCommand() : {
+    Token json = null;
+    TimestampSymbol timestamp = null;
+}
+{
+    <FIND_OR_INSERT>
+    DisjunctionExpression()
+    (timestamp=TimestampReadCommand())?
+    json=<QUOTED_STRING>
+    { return new FindOrInsertSymbol(json.image, timestamp); }
+}
+
 CommandSymbol DescribeCommand() : {
     Token record = null;
     Collection records = null;
@@ -1297,13 +1324,12 @@ CommandSymbol TraceCommand() : {
     <TRACE>
     (
         LOOKAHEAD(2)
-        record=<NUMERIC>
+        record=<NUMERIC> (timestamp=TimestampReadCommand())?
         { return new TraceSymbol(Long.parseLong(record.image), timestamp); }
       |
-        records=RecordCollection()
+        records=RecordCollection() (timestamp=TimestampReadCommand())?
         { return new TraceSymbol(records, timestamp); }
     )
-    (timestamp=TimestampReadCommand())?
 }
 
 // Transaction Operations
diff --git a/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java b/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
index a9350725..e9ac6a62 100644
--- a/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
+++ b/src/main/java/com/cinchapi/ccl/CompilerJavaCC.java
@@ -23,6 +23,7 @@
 import com.cinchapi.ccl.generated.*;
 import com.cinchapi.ccl.syntax.*;
 import com.cinchapi.ccl.type.Operator;
+import com.cinchapi.concourse.lang.sort.Order;
 import com.google.common.collect.Multimap;
 
 /**
@@ -154,7 +155,24 @@ public Object visit(ASTFunction node, Object data) {
 
                 @Override
                 public Object visit(ASTCommand node, Object data) {
-                    return new CommandTree(node.command(), null, null, null);
+                    ConditionTree conditionTree = null;
+                    OrderTree orderTree = null;
+                    PageTree pageTree = null;
+
+                    for(int i = 0; i < node.jjtGetNumChildren(); i++) {
+                        Object child = node.jjtGetChild(i).jjtAccept(this, data);
+                        if (child instanceof ConditionTree) {
+                            conditionTree = (ConditionTree) child;
+                        }
+                        else if (child instanceof PageTree) {
+                            pageTree = (PageTree) child;
+                        }
+                        else if (child instanceof OrderTree) {
+                            orderTree = (OrderTree) child;
+                        }
+                    }
+
+                    return new CommandTree(node.command(), conditionTree, pageTree, orderTree);
                 }
             };
 
diff --git a/src/main/java/com/cinchapi/ccl/generated/Grammar.java b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
index 34ef1904..74f1e5cf 100644
--- a/src/main/java/com/cinchapi/ccl/generated/Grammar.java
+++ b/src/main/java/com/cinchapi/ccl/generated/Grammar.java
@@ -108,6 +108,8 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
       case SELECT:
       case GET:
       case FIND:
+      case FIND_OR_ADD:
+      case FIND_OR_INSERT:
       case DESCRIBE:
       case VERIFY:
       case SEARCH:
@@ -125,7 +127,7 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
       case ABORT:
       case REVERT:{
         Command();
-        jj_consume_token(88);
+        jj_consume_token(90);
         break;
         }
       default:
@@ -160,18 +162,18 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
             jj_la1[2] = jj_gen;
             ;
           }
-          jj_consume_token(88);
+          jj_consume_token(90);
         } else {
           switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
           case PAGE:
           case SIZE:{
             Page();
-            jj_consume_token(88);
+            jj_consume_token(90);
             break;
             }
           case ORDER:{
             Order();
-            jj_consume_token(88);
+            jj_consume_token(90);
             break;
             }
           case NUMERIC:
@@ -180,7 +182,7 @@ final public ASTStart StartCommandLine() throws ParseException {/*@bgen(jjtree)
           case ALPHANUMERIC:
           case PERIOD_SEPARATED_STRING:{
             Function();
-            jj_consume_token(88);
+            jj_consume_token(90);
             break;
             }
           default:
@@ -233,6 +235,8 @@ final public ASTStart generateAST() throws ParseException {/*@bgen(jjtree) Start
       case SELECT:
       case GET:
       case FIND:
+      case FIND_OR_ADD:
+      case FIND_OR_INSERT:
       case DESCRIBE:
       case VERIFY:
       case SEARCH:
@@ -754,12 +758,12 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 89:{
-          word = jj_consume_token(89);
+        case 91:{
+          word = jj_consume_token(91);
           break;
           }
-        case 90:{
-          word = jj_consume_token(90);
+        case 92:{
+          word = jj_consume_token(92);
           break;
           }
         default:
@@ -792,8 +796,8 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
     case ALPHANUMERIC:
     case PERIOD_SEPARATED_STRING:
     case NON_ALPHANUMERIC_AND_ALPHANUMERIC:
-    case 89:
-    case 90:{
+    case 91:
+    case 92:{
       label_5:
       while (true) {
         switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -821,12 +825,12 @@ else if(value.length() > 2 && value.charAt(0) == '\\'
           word = jj_consume_token(PERIOD_SEPARATED_STRING);
           break;
           }
-        case 89:{
-          word = jj_consume_token(89);
+        case 91:{
+          word = jj_consume_token(91);
           break;
           }
-        case 90:{
-          word = jj_consume_token(90);
+        case 92:{
+          word = jj_consume_token(92);
           break;
           }
         default:
@@ -1709,6 +1713,8 @@ final public void Command() throws ParseException {/*@bgen(jjtree) Command */
       case SELECT:
       case GET:
       case FIND:
+      case FIND_OR_ADD:
+      case FIND_OR_INSERT:
       case DESCRIBE:
       case VERIFY:
       case SEARCH:
@@ -2115,6 +2121,14 @@ record = jj_consume_token(NUMERIC);
       cmd = FindCommand();
       break;
       }
+    case FIND_OR_ADD:{
+      cmd = FindOrAddCommand();
+      break;
+      }
+    case FIND_OR_INSERT:{
+      cmd = FindOrInsertCommand();
+      break;
+      }
     case DESCRIBE:{
       cmd = DescribeCommand();
       break;
@@ -2553,6 +2567,36 @@ record = jj_consume_token(NUMERIC);
     throw new Error("Missing return statement in function");
 }
 
+  final public CommandSymbol FindOrAddCommand() throws ParseException {KeyTokenSymbol<?> key;
+    ValueTokenSymbol<?> value;
+    jj_consume_token(FIND_OR_ADD);
+    key = Key();
+    jj_consume_token(AS);
+    value = UnaryValue();
+{if ("" != null) return new FindOrAddSymbol(key, value);}
+    throw new Error("Missing return statement in function");
+}
+
+  final public CommandSymbol FindOrInsertCommand() throws ParseException {Token json = null;
+    TimestampSymbol timestamp = null;
+    jj_consume_token(FIND_OR_INSERT);
+    DisjunctionExpression();
+    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+    case IN:
+    case AS_OF:
+    case TIMESTAMP:{
+      timestamp = TimestampReadCommand();
+      break;
+      }
+    default:
+      jj_la1[97] = jj_gen;
+      ;
+    }
+    json = jj_consume_token(QUOTED_STRING);
+{if ("" != null) return new FindOrInsertSymbol(json.image, timestamp);}
+    throw new Error("Missing return statement in function");
+}
+
   final public CommandSymbol DescribeCommand() throws ParseException {Token record = null;
     Collection records = null;
     TimestampSymbol timestamp = null;
@@ -2567,7 +2611,7 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[97] = jj_gen;
+        jj_la1[98] = jj_gen;
         ;
       }
 {if ("" != null) return new DescribeSymbol(Long.parseLong(record.image), timestamp);}
@@ -2583,14 +2627,14 @@ record = jj_consume_token(NUMERIC);
           break;
           }
         default:
-          jj_la1[98] = jj_gen;
+          jj_la1[99] = jj_gen;
           ;
         }
 {if ("" != null) return new DescribeSymbol(records, timestamp);}
         break;
         }
       default:
-        jj_la1[99] = jj_gen;
+        jj_la1[100] = jj_gen;
 {if ("" != null) return new DescribeSymbol(-1, null);}
       }
     }
@@ -2615,7 +2659,7 @@ record = jj_consume_token(NUMERIC);
       break;
       }
     default:
-      jj_la1[100] = jj_gen;
+      jj_la1[101] = jj_gen;
       ;
     }
 {if ("" != null) return new VerifySymbol(key, value, Long.parseLong(record.image), timestamp);}
@@ -2644,7 +2688,7 @@ record = jj_consume_token(NUMERIC);
       break;
       }
     default:
-      jj_la1[101] = jj_gen;
+      jj_la1[102] = jj_gen;
       ;
     }
 {if ("" != null) return new BrowseSymbol(keys, timestamp);}
@@ -2672,13 +2716,13 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[102] = jj_gen;
+        jj_la1[103] = jj_gen;
         ;
       }
       break;
       }
     default:
-      jj_la1[103] = jj_gen;
+      jj_la1[104] = jj_gen;
       ;
     }
 {if ("" != null) return new ChronologizeSymbol(key, Long.parseLong(record.image), start, end);}
@@ -2707,7 +2751,7 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[104] = jj_gen;
+        jj_la1[105] = jj_gen;
         ;
       }
 {if ("" != null) return new DiffSymbol(key, Long.parseLong(record.image), start, end);}
@@ -2734,7 +2778,7 @@ record = jj_consume_token(NUMERIC);
             break;
             }
           default:
-            jj_la1[105] = jj_gen;
+            jj_la1[106] = jj_gen;
             jj_consume_token(-1);
             throw new ParseException();
           }
@@ -2742,7 +2786,7 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[106] = jj_gen;
+        jj_la1[107] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2772,7 +2816,7 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[107] = jj_gen;
+        jj_la1[108] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -2785,7 +2829,7 @@ record = jj_consume_token(NUMERIC);
       break;
       }
     default:
-      jj_la1[108] = jj_gen;
+      jj_la1[109] = jj_gen;
       ;
     }
     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
@@ -2796,7 +2840,7 @@ record = jj_consume_token(NUMERIC);
       break;
       }
     default:
-      jj_la1[109] = jj_gen;
+      jj_la1[110] = jj_gen;
       ;
     }
     throw new Error("Missing return statement in function");
@@ -2831,7 +2875,7 @@ record = jj_consume_token(NUMERIC);
             break;
             }
           default:
-            jj_la1[110] = jj_gen;
+            jj_la1[111] = jj_gen;
             ;
           }
 {if ("" != null) return new NavigateSymbol(keys, Long.parseLong(record.image), timestamp);}
@@ -2847,28 +2891,28 @@ record = jj_consume_token(NUMERIC);
             break;
             }
           default:
-            jj_la1[111] = jj_gen;
+            jj_la1[112] = jj_gen;
             ;
           }
 {if ("" != null) return new NavigateSymbol(keys, records, timestamp);}
           break;
           }
         default:
-          jj_la1[112] = jj_gen;
+          jj_la1[113] = jj_gen;
           jj_consume_token(-1);
           throw new ParseException();
         }
         break;
         }
       default:
-        jj_la1[113] = jj_gen;
+        jj_la1[114] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
       break;
       }
     default:
-      jj_la1[114] = jj_gen;
+      jj_la1[115] = jj_gen;
       ;
     }
     throw new Error("Missing return statement in function");
@@ -2912,13 +2956,13 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[115] = jj_gen;
+        jj_la1[116] = jj_gen;
         ;
       }
       break;
       }
     default:
-      jj_la1[116] = jj_gen;
+      jj_la1[117] = jj_gen;
       ;
     }
 {if ("" != null) return new ReviewSymbol(key, Long.parseLong(record.image), start, end);}
@@ -2931,31 +2975,42 @@ record = jj_consume_token(NUMERIC);
     jj_consume_token(TRACE);
     if (jj_2_38(2)) {
       record = jj_consume_token(NUMERIC);
+      switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+      case IN:
+      case AS_OF:
+      case TIMESTAMP:{
+        timestamp = TimestampReadCommand();
+        break;
+        }
+      default:
+        jj_la1[118] = jj_gen;
+        ;
+      }
 {if ("" != null) return new TraceSymbol(Long.parseLong(record.image), timestamp);}
     } else {
       switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
       case OPEN_BRACKET:{
         records = RecordCollection();
+        switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
+        case IN:
+        case AS_OF:
+        case TIMESTAMP:{
+          timestamp = TimestampReadCommand();
+          break;
+          }
+        default:
+          jj_la1[119] = jj_gen;
+          ;
+        }
 {if ("" != null) return new TraceSymbol(records, timestamp);}
         break;
         }
       default:
-        jj_la1[117] = jj_gen;
+        jj_la1[120] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
     }
-    switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
-    case IN:
-    case AS_OF:
-    case TIMESTAMP:{
-      timestamp = TimestampReadCommand();
-      break;
-      }
-    default:
-      jj_la1[118] = jj_gen;
-      ;
-    }
     throw new Error("Missing return statement in function");
 }
 
@@ -2975,7 +3030,7 @@ record = jj_consume_token(NUMERIC);
       break;
       }
     default:
-      jj_la1[119] = jj_gen;
+      jj_la1[121] = jj_gen;
       jj_consume_token(-1);
       throw new ParseException();
     }
@@ -3036,7 +3091,7 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[120] = jj_gen;
+        jj_la1[122] = jj_gen;
         jj_consume_token(-1);
         throw new ParseException();
       }
@@ -3058,7 +3113,7 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[121] = jj_gen;
+        jj_la1[123] = jj_gen;
         break label_11;
       }
       jj_consume_token(COMMA);
@@ -3083,7 +3138,7 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[122] = jj_gen;
+        jj_la1[124] = jj_gen;
         break label_12;
       }
       jj_consume_token(COMMA);
@@ -3108,7 +3163,7 @@ record = jj_consume_token(NUMERIC);
         break;
         }
       default:
-        jj_la1[123] = jj_gen;
+        jj_la1[125] = jj_gen;
         break label_13;
       }
       jj_consume_token(COMMA);
@@ -3454,23 +3509,12 @@ private boolean jj_2_41(int xla)
     finally { jj_save(40, xla); }
   }
 
-  private boolean jj_3R_43()
+  private boolean jj_3_38()
  {
+    if (jj_scan_token(NUMERIC)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(49)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(79)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(77)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(81)) return true;
-    }
-    }
-    }
-    }
+    if (jj_3R_38()) jj_scanpos = xsp;
     return false;
   }
 
@@ -3486,9 +3530,9 @@ private boolean jj_3R_27()
     xsp = jj_scanpos;
     if (jj_3_7()) {
     jj_scanpos = xsp;
-    if (jj_3R_43()) {
+    if (jj_3R_44()) {
     jj_scanpos = xsp;
-    if (jj_3R_44()) return true;
+    if (jj_3R_45()) return true;
     }
     }
     return false;
@@ -3498,9 +3542,9 @@ private boolean jj_3R_19()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(47)) {
+    if (jj_scan_token(49)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(32)) return true;
+    if (jj_scan_token(34)) return true;
     }
     if (jj_3_13()) return true;
     while (true) {
@@ -3510,15 +3554,6 @@ private boolean jj_3R_19()
     return false;
   }
 
-  private boolean jj_3_32()
- {
-    if (jj_scan_token(NUMERIC)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_36()) jj_scanpos = xsp;
-    return false;
-  }
-
   private boolean jj_3R_25()
  {
     if (jj_scan_token(OPEN_BRACKET)) return true;
@@ -3529,50 +3564,57 @@ private boolean jj_3R_24()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(79)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(77)) return true;
+    if (jj_scan_token(79)) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_77()
+  private boolean jj_3R_78()
  {
     if (jj_scan_token(BINARY_OPERATOR)) return true;
     return false;
   }
 
-  private boolean jj_3R_67()
+  private boolean jj_3R_68()
  {
-    if (jj_3R_77()) return true;
-    if (jj_3R_78()) return true;
     if (jj_3R_78()) return true;
+    if (jj_3R_79()) return true;
+    if (jj_3R_79()) return true;
     return false;
   }
 
-  private boolean jj_3R_66()
+  private boolean jj_3R_29()
+ {
+    if (jj_3R_14()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_67()
  {
-    if (jj_3R_75()) return true;
     if (jj_3R_76()) return true;
+    if (jj_3R_77()) return true;
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_5()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_65()
+  private boolean jj_3R_66()
  {
-    if (jj_3R_73()) return true;
     if (jj_3R_74()) return true;
+    if (jj_3R_75()) return true;
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_4()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_29()
+  private boolean jj_3_37()
  {
-    if (jj_3R_14()) return true;
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(IN)) return true;
     return false;
   }
 
@@ -3580,13 +3622,13 @@ private boolean jj_3_17()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(79)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) {
+    if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(82)) return true;
+    if (jj_scan_token(84)) return true;
     }
     }
     }
@@ -3606,25 +3648,25 @@ private boolean jj_3R_23()
     return false;
   }
 
-  private boolean jj_3R_64()
+  private boolean jj_3R_65()
  {
-    if (jj_3R_71()) return true;
     if (jj_3R_72()) return true;
+    if (jj_3R_73()) return true;
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_3()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_75()
+  private boolean jj_3R_76()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(52)) {
-    jj_scanpos = xsp;
     if (jj_scan_token(54)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(55)) return true;
+    if (jj_scan_token(56)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(57)) return true;
     }
     }
     return false;
@@ -3638,57 +3680,57 @@ private boolean jj_3R_22()
 
   private boolean jj_3R_18()
  {
-    if (jj_3R_41()) return true;
+    if (jj_3R_42()) return true;
     return false;
   }
 
-  private boolean jj_3R_47()
+  private boolean jj_3R_48()
  {
     if (jj_scan_token(CONJUNCTION)) return true;
     return false;
   }
 
-  private boolean jj_3_38()
- {
-    if (jj_scan_token(NUMERIC)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_39()
+  private boolean jj_3R_40()
  {
     if (jj_scan_token(DISJUNCTION)) return true;
     return false;
   }
 
-  private boolean jj_3R_61()
+  private boolean jj_3R_62()
  {
     if (jj_3R_27()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_64()) {
-    jj_scanpos = xsp;
     if (jj_3R_65()) {
     jj_scanpos = xsp;
     if (jj_3R_66()) {
     jj_scanpos = xsp;
-    if (jj_3R_67()) return true;
+    if (jj_3R_67()) {
+    jj_scanpos = xsp;
+    if (jj_3R_68()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_73()
+  private boolean jj_3_31()
+ {
+    if (jj_3R_28()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_74()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(63)) {
+    if (jj_scan_token(65)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(64)) {
+    if (jj_scan_token(66)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(65)) {
+    if (jj_scan_token(67)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(66)) return true;
+    if (jj_scan_token(68)) return true;
     }
     }
     }
@@ -3699,13 +3741,13 @@ private boolean jj_3_16()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(79)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) {
+    if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(82)) return true;
+    if (jj_scan_token(84)) return true;
     }
     }
     }
@@ -3717,15 +3759,24 @@ private boolean jj_3_16()
     return false;
   }
 
-  private boolean jj_3_31()
+  private boolean jj_3_30()
  {
     if (jj_3R_28()) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_33()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_34()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_35()) jj_scanpos = xsp;
     return false;
   }
 
   private boolean jj_3R_17()
  {
-    if (jj_3R_40()) return true;
+    if (jj_3R_41()) return true;
     return false;
   }
 
@@ -3736,87 +3787,81 @@ private boolean jj_3R_21()
     return false;
   }
 
-  private boolean jj_3_30()
+  private boolean jj_3_29()
  {
-    if (jj_3R_28()) return true;
+    if (jj_3R_27()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_33()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_34()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_35()) jj_scanpos = xsp;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_71()
+  private boolean jj_3R_72()
  {
     if (jj_scan_token(LINKS_TO)) return true;
     return false;
   }
 
-  private boolean jj_3R_52()
+  private boolean jj_3R_53()
  {
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
     if (jj_3R_14()) return true;
     return false;
   }
 
-  private boolean jj_3R_46()
+  private boolean jj_3R_47()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_52()) {
+    if (jj_3R_53()) {
     jj_scanpos = xsp;
-    if (jj_3R_53()) return true;
+    if (jj_3R_54()) return true;
     }
     return false;
   }
 
   private boolean jj_3R_16()
  {
-    if (jj_3R_41()) return true;
+    if (jj_3R_42()) return true;
     return false;
   }
 
-  private boolean jj_3_29()
+  private boolean jj_3_28()
  {
     if (jj_3R_27()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_26()) return true;
-    return false;
-  }
-
-  private boolean jj_3_37()
- {
-    if (jj_3R_27()) return true;
-    if (jj_scan_token(IN)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_28()
+  private boolean jj_3_27()
  {
-    if (jj_3R_27()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_3R_28()) return true;
+    if (jj_scan_token(WHERE)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_29()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_30()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_31()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_32()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_87()
+  private boolean jj_3R_88()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_38()
+  private boolean jj_3R_39()
  {
-    if (jj_3R_46()) return true;
+    if (jj_3R_47()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_47()) { jj_scanpos = xsp; break; }
+      if (jj_3R_48()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -3825,15 +3870,15 @@ private boolean jj_3R_20()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(79)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(77)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) {
+    if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(82)) return true;
+    if (jj_scan_token(84)) return true;
     }
     }
     }
@@ -3843,35 +3888,19 @@ private boolean jj_3R_20()
     return false;
   }
 
-  private boolean jj_3_27()
- {
-    if (jj_3R_28()) return true;
-    if (jj_scan_token(WHERE)) return true;
-    Token xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_29()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_30()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_31()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
-    if (jj_3R_32()) jj_scanpos = xsp;
-    return false;
-  }
-
   private boolean jj_3R_15()
  {
-    if (jj_3R_40()) return true;
+    if (jj_3R_41()) return true;
     return false;
   }
 
   private boolean jj_3R_14()
  {
-    if (jj_3R_38()) return true;
+    if (jj_3R_39()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_39()) { jj_scanpos = xsp; break; }
+      if (jj_3R_40()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -3906,17 +3935,24 @@ private boolean jj_3_21()
     return false;
   }
 
-  private boolean jj_3R_80()
+  private boolean jj_3_26()
  {
-    if (jj_scan_token(DESC)) return true;
+    if (jj_scan_token(FROM)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3_2()
+  private boolean jj_3R_81()
+ {
+    if (jj_scan_token(DESC)) return true;
+    return false;
+  }
+
+  private boolean jj_3_2()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(48)) jj_scanpos = xsp;
+    if (jj_scan_token(50)) jj_scanpos = xsp;
     if (jj_3R_14()) return true;
     xsp = jj_scanpos;
     if (jj_3R_17()) jj_scanpos = xsp;
@@ -3926,42 +3962,41 @@ private boolean jj_3_2()
     return false;
   }
 
-  private boolean jj_3R_79()
+  private boolean jj_3_36()
  {
-    if (jj_scan_token(ASC)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_20()
+  private boolean jj_3R_80()
  {
-    if (jj_3R_27()) return true;
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_scan_token(ASC)) return true;
     return false;
   }
 
-  private boolean jj_3_26()
+  private boolean jj_3_20()
  {
+    if (jj_3R_27()) return true;
     if (jj_scan_token(FROM)) return true;
-    if (jj_3R_26()) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_86()
+  private boolean jj_3R_87()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(79)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(77)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
     if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(82)) return true;
+    if (jj_scan_token(85)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(84)) return true;
     }
     }
     }
@@ -3970,39 +4005,39 @@ private boolean jj_3R_86()
     return false;
   }
 
+  private boolean jj_3_25()
+ {
+    if (jj_scan_token(FROM)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    return false;
+  }
+
   private boolean jj_3_19()
  {
     if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_70()
+  private boolean jj_3R_71()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_79()) {
+    if (jj_3R_80()) {
     jj_scanpos = xsp;
-    if (jj_3R_80()) return true;
+    if (jj_3R_81()) return true;
     }
     return false;
   }
 
-  private boolean jj_3_25()
- {
-    if (jj_scan_token(FROM)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_78()
+  private boolean jj_3R_79()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_12()) {
     jj_scanpos = xsp;
-    if (jj_3R_86()) {
+    if (jj_3R_87()) {
     jj_scanpos = xsp;
-    if (jj_3R_87()) return true;
+    if (jj_3R_88()) return true;
     }
     }
     return false;
@@ -4020,15 +4055,16 @@ private boolean jj_3_18()
     return false;
   }
 
-  private boolean jj_3R_69()
+  private boolean jj_3R_46()
  {
-    if (jj_scan_token(CLOSE_ANGLE_BRACKET)) return true;
+    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_68()
+  private boolean jj_3R_70()
  {
-    if (jj_scan_token(OPEN_ANGLE_BRACKET)) return true;
+    if (jj_scan_token(CLOSE_ANGLE_BRACKET)) return true;
     return false;
   }
 
@@ -4038,40 +4074,66 @@ private boolean jj_3_24()
     return false;
   }
 
+  private boolean jj_3R_69()
+ {
+    if (jj_scan_token(OPEN_ANGLE_BRACKET)) return true;
+    return false;
+  }
+
   private boolean jj_3_1()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(48)) jj_scanpos = xsp;
+    if (jj_scan_token(50)) jj_scanpos = xsp;
     if (jj_3R_14()) return true;
     xsp = jj_scanpos;
     if (jj_3R_15()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3R_16()) jj_scanpos = xsp;
-    if (jj_scan_token(88)) return true;
+    if (jj_scan_token(90)) return true;
     return false;
   }
 
-  private boolean jj_3R_83()
+  private boolean jj_3R_28()
+ {
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_27()) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_46()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(CLOSE_BRACKET)) return true;
+    return false;
+  }
+
+  private boolean jj_3R_84()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_62()
+  private boolean jj_3R_63()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_68()) {
+    if (jj_3R_69()) {
     jj_scanpos = xsp;
-    if (jj_3R_69()) return true;
+    if (jj_3R_70()) return true;
     }
     return false;
   }
 
-  private boolean jj_3_36()
+  private boolean jj_3_34()
  {
-    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_3R_37()) return true;
+    if (jj_3R_37()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_43()
+ {
+    if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
@@ -4079,21 +4141,21 @@ private boolean jj_3_10()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(79)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(77)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
     if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(82)) {
+    if (jj_scan_token(85)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(89)) {
+    if (jj_scan_token(84)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(90)) return true;
+    if (jj_scan_token(91)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(92)) return true;
     }
     }
     }
@@ -4104,25 +4166,45 @@ private boolean jj_3_10()
     return false;
   }
 
+  private boolean jj_3_35()
+ {
+    if (jj_scan_token(NUMERIC)) return true;
+    if (jj_3R_37()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_26()
+ {
+    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
+    Token xsp;
+    while (true) {
+      xsp = jj_scanpos;
+      if (jj_3R_43()) { jj_scanpos = xsp; break; }
+    }
+    if (jj_scan_token(CLOSE_BRACKET)) return true;
+    return false;
+  }
+
   private boolean jj_3_11()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(79)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(77)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
     if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(82)) {
+    if (jj_scan_token(85)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(89)) {
+    if (jj_scan_token(84)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(90)) return true;
+    if (jj_scan_token(91)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(92)) return true;
     }
     }
     }
@@ -4133,7 +4215,7 @@ private boolean jj_3_11()
     return false;
   }
 
-  private boolean jj_3R_82()
+  private boolean jj_3R_83()
  {
     Token xsp;
     if (jj_3_11()) return true;
@@ -4144,46 +4226,26 @@ private boolean jj_3R_82()
     return false;
   }
 
-  private boolean jj_3R_45()
- {
-    if (jj_scan_token(COMMA)) return true;
-    if (jj_3R_27()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_63()
- {
-    if (jj_3R_70()) return true;
-    return false;
-  }
-
-  private boolean jj_3R_28()
+  private boolean jj_3_33()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
     if (jj_3R_27()) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_45()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(CLOSE_BRACKET)) return true;
+    if (jj_scan_token(IN)) return true;
     return false;
   }
 
-  private boolean jj_3_34()
+  private boolean jj_3R_64()
  {
-    if (jj_3R_37()) return true;
-    if (jj_3R_37()) return true;
+    if (jj_3R_71()) return true;
     return false;
   }
 
-  private boolean jj_3R_58()
+  private boolean jj_3R_59()
  {
     if (jj_3R_19()) return true;
     return false;
   }
 
-  private boolean jj_3R_81()
+  private boolean jj_3R_82()
  {
     if (jj_scan_token(OPEN_PARENTHESES)) return true;
     Token xsp;
@@ -4195,125 +4257,117 @@ private boolean jj_3R_81()
     return false;
   }
 
-  private boolean jj_3R_74()
+  private boolean jj_3R_75()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_81()) {
-    jj_scanpos = xsp;
     if (jj_3R_82()) {
     jj_scanpos = xsp;
-    if (jj_3R_83()) return true;
+    if (jj_3R_83()) {
+    jj_scanpos = xsp;
+    if (jj_3R_84()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_57()
+  private boolean jj_3R_58()
  {
     if (jj_3R_27()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_63()) jj_scanpos = xsp;
-    return false;
-  }
-
-  private boolean jj_3R_42()
- {
-    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_64()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_56()
+  private boolean jj_3R_57()
  {
-    if (jj_3R_62()) return true;
+    if (jj_3R_63()) return true;
     if (jj_3R_27()) return true;
     return false;
   }
 
-  private boolean jj_3R_50()
+  private boolean jj_3R_51()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_56()) {
+    if (jj_3R_57()) {
     jj_scanpos = xsp;
-    if (jj_3R_57()) return true;
+    if (jj_3R_58()) return true;
     }
     xsp = jj_scanpos;
-    if (jj_3R_58()) jj_scanpos = xsp;
+    if (jj_3R_59()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_26()
+  private boolean jj_3_41()
  {
-    if (jj_scan_token(OPEN_BRACKET)) return true;
+    if (jj_3R_28()) return true;
+    if (jj_scan_token(IN)) return true;
     if (jj_scan_token(NUMERIC)) return true;
-    Token xsp;
-    while (true) {
-      xsp = jj_scanpos;
-      if (jj_3R_42()) { jj_scanpos = xsp; break; }
-    }
-    if (jj_scan_token(CLOSE_BRACKET)) return true;
+    if (jj_3R_37()) return true;
     return false;
   }
 
-  private boolean jj_3_35()
+  private boolean jj_3R_35()
  {
-    if (jj_scan_token(NUMERIC)) return true;
-    if (jj_3R_37()) return true;
+    if (jj_3R_42()) return true;
     return false;
   }
 
-  private boolean jj_3_33()
+  private boolean jj_3R_32()
  {
-    if (jj_3R_27()) return true;
-    if (jj_scan_token(IN)) return true;
+    if (jj_3R_42()) return true;
     return false;
   }
 
-  private boolean jj_3R_72()
+  private boolean jj_3R_73()
  {
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_51()
+  private boolean jj_3_40()
  {
-    if (jj_scan_token(COMMA)) return true;
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(IN)) return true;
+    if (jj_3R_26()) return true;
     return false;
   }
 
-  private boolean jj_3R_35()
+  private boolean jj_3R_52()
  {
-    if (jj_3R_41()) return true;
+    if (jj_scan_token(COMMA)) return true;
     return false;
   }
 
-  private boolean jj_3R_32()
+  private boolean jj_3_6()
  {
-    if (jj_3R_41()) return true;
+    if (jj_3R_19()) return true;
     return false;
   }
 
-  private boolean jj_3_6()
+  private boolean jj_3_39()
  {
-    if (jj_3R_19()) return true;
+    if (jj_3R_27()) return true;
+    if (jj_scan_token(IN)) return true;
+    if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3R_40()
+  private boolean jj_3R_41()
  {
     if (jj_scan_token(ORDER)) return true;
-    if (jj_3R_50()) return true;
+    if (jj_3R_51()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_51()) { jj_scanpos = xsp; break; }
+      if (jj_3R_52()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_85()
+  private boolean jj_3R_86()
  {
     if (jj_scan_token(QUOTED_STRING)) return true;
     return false;
@@ -4321,28 +4375,25 @@ private boolean jj_3R_85()
 
   private boolean jj_3R_34()
  {
-    if (jj_3R_40()) return true;
+    if (jj_3R_41()) return true;
     return false;
   }
 
   private boolean jj_3R_31()
  {
-    if (jj_3R_40()) return true;
+    if (jj_3R_41()) return true;
     return false;
   }
 
-  private boolean jj_3R_55()
+  private boolean jj_3R_56()
  {
     if (jj_scan_token(SIZE)) return true;
     if (jj_scan_token(NUMERIC)) return true;
     return false;
   }
 
-  private boolean jj_3_41()
+  private boolean jj_3R_36()
  {
-    if (jj_3R_28()) return true;
-    if (jj_scan_token(IN)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
     if (jj_3R_37()) return true;
     return false;
   }
@@ -4351,17 +4402,17 @@ private boolean jj_3_14()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(74)) {
+    if (jj_scan_token(76)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(79)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(77)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) {
+    if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(83)) return true;
+    if (jj_scan_token(85)) return true;
     }
     }
     }
@@ -4370,23 +4421,15 @@ private boolean jj_3_14()
     return false;
   }
 
-  private boolean jj_3R_59()
- {
-    if (jj_3R_55()) return true;
-    return false;
-  }
-
-  private boolean jj_3_40()
+  private boolean jj_3R_60()
  {
-    if (jj_3R_27()) return true;
-    if (jj_scan_token(IN)) return true;
-    if (jj_3R_26()) return true;
+    if (jj_3R_56()) return true;
     return false;
   }
 
-  private boolean jj_3R_60()
+  private boolean jj_3R_61()
  {
-    if (jj_3R_54()) return true;
+    if (jj_3R_55()) return true;
     return false;
   }
 
@@ -4396,9 +4439,9 @@ private boolean jj_3_4()
     return false;
   }
 
-  private boolean jj_3R_53()
+  private boolean jj_3R_54()
  {
-    if (jj_3R_61()) return true;
+    if (jj_3R_62()) return true;
     return false;
   }
 
@@ -4414,15 +4457,7 @@ private boolean jj_3_3()
     return false;
   }
 
-  private boolean jj_3_39()
- {
-    if (jj_3R_27()) return true;
-    if (jj_scan_token(IN)) return true;
-    if (jj_scan_token(NUMERIC)) return true;
-    return false;
-  }
-
-  private boolean jj_3R_54()
+  private boolean jj_3R_55()
  {
     if (jj_scan_token(PAGE)) return true;
     if (jj_scan_token(NUMERIC)) return true;
@@ -4433,17 +4468,17 @@ private boolean jj_3_8()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(79)) {
-    jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(77)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
     if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(82)) return true;
+    if (jj_scan_token(85)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(84)) return true;
     }
     }
     }
@@ -4452,7 +4487,7 @@ private boolean jj_3_8()
     return false;
   }
 
-  private boolean jj_3R_84()
+  private boolean jj_3R_85()
  {
     Token xsp;
     if (jj_3_8()) return true;
@@ -4463,24 +4498,39 @@ private boolean jj_3R_84()
     return false;
   }
 
-  private boolean jj_3R_49()
+  private boolean jj_3R_50()
  {
-    if (jj_3R_55()) return true;
+    if (jj_3R_56()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_60()) jj_scanpos = xsp;
+    if (jj_3R_61()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_76()
+  private boolean jj_3_32()
+ {
+    if (jj_scan_token(NUMERIC)) return true;
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_36()) jj_scanpos = xsp;
+    return false;
+  }
+
+  private boolean jj_3R_38()
+ {
+    if (jj_3R_37()) return true;
+    return false;
+  }
+
+  private boolean jj_3R_77()
  {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_9()) {
     jj_scanpos = xsp;
-    if (jj_3R_84()) {
+    if (jj_3R_85()) {
     jj_scanpos = xsp;
-    if (jj_3R_85()) return true;
+    if (jj_3R_86()) return true;
     }
     }
     return false;
@@ -4492,12 +4542,12 @@ private boolean jj_3_9()
     return false;
   }
 
-  private boolean jj_3R_48()
+  private boolean jj_3R_49()
  {
-    if (jj_3R_54()) return true;
+    if (jj_3R_55()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_59()) jj_scanpos = xsp;
+    if (jj_3R_60()) jj_scanpos = xsp;
     return false;
   }
 
@@ -4505,17 +4555,17 @@ private boolean jj_3_13()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(74)) {
+    if (jj_scan_token(76)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(79)) {
+    if (jj_scan_token(81)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(80)) {
+    if (jj_scan_token(82)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(77)) {
+    if (jj_scan_token(79)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(81)) {
+    if (jj_scan_token(83)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(83)) return true;
+    if (jj_scan_token(85)) return true;
     }
     }
     }
@@ -4524,23 +4574,17 @@ private boolean jj_3_13()
     return false;
   }
 
-  private boolean jj_3R_41()
+  private boolean jj_3R_42()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_48()) {
+    if (jj_3R_49()) {
     jj_scanpos = xsp;
-    if (jj_3R_49()) return true;
+    if (jj_3R_50()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_36()
- {
-    if (jj_3R_37()) return true;
-    return false;
-  }
-
   private boolean jj_3R_33()
  {
     if (jj_3R_37()) return true;
@@ -4553,7 +4597,7 @@ private boolean jj_3R_30()
     return false;
   }
 
-  private boolean jj_3R_44()
+  private boolean jj_3R_45()
  {
     if (jj_scan_token(PERIOD_SEPARATED_STRING)) return true;
     return false;
@@ -4563,11 +4607,11 @@ private boolean jj_3R_37()
  {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_scan_token(47)) {
+    if (jj_scan_token(49)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(32)) {
+    if (jj_scan_token(34)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(36)) return true;
+    if (jj_scan_token(38)) return true;
     }
     }
     if (jj_3_14()) return true;
@@ -4578,6 +4622,26 @@ private boolean jj_3R_37()
     return false;
   }
 
+  private boolean jj_3R_44()
+ {
+    Token xsp;
+    xsp = jj_scanpos;
+    if (jj_scan_token(51)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(81)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(82)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(79)) {
+    jj_scanpos = xsp;
+    if (jj_scan_token(83)) return true;
+    }
+    }
+    }
+    }
+    return false;
+  }
+
   /** Generated Token Manager. */
   public GrammarTokenManager token_source;
   SimpleCharStream jj_input_stream;
@@ -4589,7 +4653,7 @@ private boolean jj_3R_37()
   private Token jj_scanpos, jj_lastpos;
   private int jj_la;
   private int jj_gen;
-  final private int[] jj_la1 = new int[124];
+  final private int[] jj_la1 = new int[126];
   static private int[] jj_la1_0;
   static private int[] jj_la1_1;
   static private int[] jj_la1_2;
@@ -4599,13 +4663,13 @@ private boolean jj_3R_37()
 	   jj_la1_init_2();
 	}
 	private static void jj_la1_init_0() {
-	   jj_la1_0 = new int[] {0x0,0x0,0x0,0xf7fffff8,0x0,0x0,0x0,0x0,0xf7fffff8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xf7fffff8,0x1f8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc00,0x0,0x0,0x7fff000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x70000000,0x0,0x0,0x0,0x0,};
+	   jj_la1_0 = new int[] {0x0,0x0,0x0,0xdffffff8,0x0,0x0,0x0,0x0,0xdffffff8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xdffffff8,0x1f8,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc00,0x0,0x0,0x1ffff000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0xc0000000,0x0,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_1() {
-	   jj_la1_1 = new int[] {0x10000,0x0,0x0,0x0,0x0,0x10000,0x0,0x0,0x0,0x0,0x80000,0x40000,0x20800,0xc0f00000,0x20000,0x20000,0x0,0x0,0x0,0x0,0x800,0x0,0x0,0x80000000,0xd00000,0x8001,0x0,0x8011,0x0,0x0,0x0,0x0,0x0,0x0,0xc20000,0x8001,0xc00000,0x0,0x0,0x0,0x0,0x1000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x1000,0x0,0x0,0x0,0x2000,0x1,0x20,0x5,0x2000,0x3,0x2000,0x3,0x0,0x2000,0x2000,0x0,0x20000,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x10000,0x20800,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x0,0x0,0x8011,0x8011,0x2000,0x8011,0x8011,0x8011,0x8011,0x8011,0x8011,0x20000,0x2000,0x80,0x8011,0x8011,0x8011,0x2000,0x10004,0x10004,0x8011,0x8011,0x2000,0x8011,0x0,0x2000,0x0,0x0,0x0,};
+	   jj_la1_1 = new int[] {0x40000,0x0,0x0,0x3,0x0,0x40000,0x0,0x0,0x3,0x0,0x200000,0x100000,0x82000,0x3c00000,0x80000,0x80000,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x0,0x3400000,0x20004,0x0,0x20044,0x0,0x0,0x0,0x0,0x0,0x0,0x3080000,0x20004,0x3000000,0x0,0x0,0x0,0x0,0x4000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x8000,0x0,0x4000,0x0,0x3,0x0,0x8000,0x4,0x80,0x14,0x8000,0xc,0x8000,0xc,0x0,0x8000,0x8000,0x0,0x80000,0x20044,0x0,0x0,0x20044,0x0,0x0,0x20044,0x0,0x0,0x40000,0x82000,0x20044,0x0,0x0,0x20044,0x0,0x0,0x20044,0x0,0x0,0x20044,0x0,0x0,0x20044,0x0,0x0,0x20044,0x0,0x0,0x20044,0x20044,0x20044,0x8000,0x20044,0x20044,0x20044,0x20044,0x20044,0x20044,0x80000,0x8000,0x200,0x20044,0x20044,0x20044,0x8000,0x40010,0x40010,0x20044,0x20044,0x20044,0x20044,0x8000,0x1,0x8000,0x0,0x0,0x0,};
 	}
 	private static void jj_la1_init_2() {
-	   jj_la1_2 = new int[] {0x0,0x40,0x30,0x0,0x7a070,0x0,0x40,0x30,0x0,0x7a070,0x0,0x0,0x7a000,0x7,0x3a000,0x7a000,0xfa000,0xfa400,0x60fa000,0x60fa000,0x60fa400,0xfa000,0xfa400,0x7,0x0,0x0,0xba400,0x0,0xba400,0x20,0x10,0x30,0x4000,0x180,0x7a000,0x0,0x0,0x180,0x20000,0x7a000,0x78000,0x4000,0x78000,0xa000,0x4000,0xa000,0xa000,0x4000,0xa000,0xa000,0x78000,0x4000,0x78000,0x0,0x0,0x2000,0x0,0x0,0x0,0x2000,0x0,0x2000,0x0,0x0,0x2000,0x2000,0x0,0x7a000,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x7a000,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x40,0x30,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x7a000,0x0,0x0,0x0,0x0,0x0,0x2000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x4000,0x4000,0x4000,};
+	   jj_la1_2 = new int[] {0x0,0x100,0xc0,0x0,0x1e81c0,0x0,0x100,0xc0,0x0,0x1e81c0,0x0,0x0,0x1e8000,0x1f,0xe8000,0x1e8000,0x3e8000,0x3e9000,0x183e8000,0x183e8000,0x183e9000,0x3e8000,0x3e9000,0x1e,0x0,0x0,0x2e9000,0x0,0x2e9000,0x80,0x40,0xc0,0x10000,0x600,0x1e8000,0x0,0x0,0x600,0x80000,0x1e8000,0x1e0000,0x10000,0x1e0000,0x28000,0x10000,0x28000,0x28000,0x10000,0x28000,0x28000,0x1e0000,0x10000,0x1e0000,0x0,0x0,0x8000,0x0,0x0,0x0,0x8000,0x0,0x8000,0x0,0x0,0x8000,0x8000,0x0,0x1e8000,0x0,0x100,0xc0,0x0,0x100,0xc0,0x0,0x100,0xc0,0x0,0x1e8000,0x0,0x100,0xc0,0x0,0x100,0xc0,0x0,0x100,0xc0,0x0,0x100,0xc0,0x0,0x100,0xc0,0x0,0x100,0xc0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1e8000,0x0,0x0,0x0,0x0,0x0,0x8000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x10000,0x10000,0x10000,};
 	}
   final private JJCalls[] jj_2_rtns = new JJCalls[41];
   private boolean jj_rescan = false;
@@ -4622,7 +4686,7 @@ public Grammar(java.io.InputStream stream, String encoding) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4638,7 +4702,7 @@ public void ReInit(java.io.InputStream stream, String encoding) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4649,7 +4713,7 @@ public Grammar(java.io.Reader stream) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4669,7 +4733,7 @@ public void ReInit(java.io.Reader stream) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4679,7 +4743,7 @@ public Grammar(GrammarTokenManager tm) {
 	 token = new Token();
 	 jj_ntk = -1;
 	 jj_gen = 0;
-	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4690,7 +4754,7 @@ public void ReInit(GrammarTokenManager tm) {
 	 jj_ntk = -1;
 	 jjtree.reset();
 	 jj_gen = 0;
-	 for (int i = 0; i < 124; i++) jj_la1[i] = -1;
+	 for (int i = 0; i < 126; i++) jj_la1[i] = -1;
 	 for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls();
   }
 
@@ -4816,12 +4880,12 @@ private void jj_add_error_token(int kind, int pos) {
   /** Generate ParseException. */
   public ParseException generateParseException() {
 	 jj_expentries.clear();
-	 boolean[] la1tokens = new boolean[91];
+	 boolean[] la1tokens = new boolean[93];
 	 if (jj_kind >= 0) {
 	   la1tokens[jj_kind] = true;
 	   jj_kind = -1;
 	 }
-	 for (int i = 0; i < 124; i++) {
+	 for (int i = 0; i < 126; i++) {
 	   if (jj_la1[i] == jj_gen) {
 		 for (int j = 0; j < 32; j++) {
 		   if ((jj_la1_0[i] & (1<<j)) != 0) {
@@ -4836,7 +4900,7 @@ public ParseException generateParseException() {
 		 }
 	   }
 	 }
-	 for (int i = 0; i < 91; i++) {
+	 for (int i = 0; i < 93; i++) {
 	   if (la1tokens[i]) {
 		 jj_expentry = new int[1];
 		 jj_expentry[0] = i;
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
index 1b818dea..1305b288 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarConstants.java
@@ -35,151 +35,155 @@ public interface GrammarConstants {
   /** RegularExpression Id. */
   int FIND = 14;
   /** RegularExpression Id. */
-  int DESCRIBE = 15;
+  int FIND_OR_ADD = 15;
   /** RegularExpression Id. */
-  int VERIFY = 16;
+  int FIND_OR_INSERT = 16;
   /** RegularExpression Id. */
-  int SEARCH = 17;
+  int DESCRIBE = 17;
   /** RegularExpression Id. */
-  int BROWSE = 18;
+  int VERIFY = 18;
   /** RegularExpression Id. */
-  int CHRONOLOGIZE = 19;
+  int SEARCH = 19;
   /** RegularExpression Id. */
-  int DIFF = 20;
+  int BROWSE = 20;
   /** RegularExpression Id. */
-  int INVENTORY = 21;
+  int CHRONOLOGIZE = 21;
   /** RegularExpression Id. */
-  int JSONIFY = 22;
+  int DIFF = 22;
   /** RegularExpression Id. */
-  int NAVIGATE = 23;
+  int INVENTORY = 23;
   /** RegularExpression Id. */
-  int RECONCILE = 24;
+  int JSONIFY = 24;
   /** RegularExpression Id. */
-  int REVIEW = 25;
+  int NAVIGATE = 25;
   /** RegularExpression Id. */
-  int TRACE = 26;
+  int RECONCILE = 26;
   /** RegularExpression Id. */
-  int CALCULATE = 27;
+  int REVIEW = 27;
   /** RegularExpression Id. */
-  int STAGE = 28;
+  int TRACE = 28;
   /** RegularExpression Id. */
-  int COMMIT = 29;
+  int CALCULATE = 29;
   /** RegularExpression Id. */
-  int ABORT = 30;
+  int STAGE = 30;
   /** RegularExpression Id. */
-  int REVERT = 31;
+  int COMMIT = 31;
   /** RegularExpression Id. */
-  int IN = 32;
+  int ABORT = 32;
   /** RegularExpression Id. */
-  int INTO = 33;
+  int REVERT = 33;
   /** RegularExpression Id. */
-  int FROM = 34;
+  int IN = 34;
   /** RegularExpression Id. */
-  int TO = 35;
+  int INTO = 35;
   /** RegularExpression Id. */
-  int AS_OF = 36;
+  int FROM = 36;
   /** RegularExpression Id. */
-  int AS = 37;
+  int TO = 37;
   /** RegularExpression Id. */
-  int FOR = 38;
+  int AS_OF = 38;
   /** RegularExpression Id. */
-  int WITH = 39;
+  int AS = 39;
   /** RegularExpression Id. */
-  int OPEN_BRACE = 40;
+  int FOR = 40;
   /** RegularExpression Id. */
-  int CLOSE_BRACE = 41;
+  int WITH = 41;
   /** RegularExpression Id. */
-  int COLON = 42;
+  int OPEN_BRACE = 42;
   /** RegularExpression Id. */
-  int OPEN_PARENTHESES = 43;
+  int CLOSE_BRACE = 43;
   /** RegularExpression Id. */
-  int CLOSE_PARENTHESES = 44;
+  int COLON = 44;
   /** RegularExpression Id. */
-  int OPEN_BRACKET = 45;
+  int OPEN_PARENTHESES = 45;
   /** RegularExpression Id. */
-  int CLOSE_BRACKET = 46;
+  int CLOSE_PARENTHESES = 46;
   /** RegularExpression Id. */
-  int TIMESTAMP = 47;
+  int OPEN_BRACKET = 47;
   /** RegularExpression Id. */
-  int WHERE = 48;
+  int CLOSE_BRACKET = 48;
   /** RegularExpression Id. */
-  int RESERVED_IDENTIFIER = 49;
+  int TIMESTAMP = 49;
   /** RegularExpression Id. */
-  int CONJUNCTION = 50;
+  int WHERE = 50;
   /** RegularExpression Id. */
-  int DISJUNCTION = 51;
+  int RESERVED_IDENTIFIER = 51;
   /** RegularExpression Id. */
-  int UNARY_OPERATOR = 52;
+  int CONJUNCTION = 52;
   /** RegularExpression Id. */
-  int BINARY_OPERATOR = 53;
+  int DISJUNCTION = 53;
   /** RegularExpression Id. */
-  int OPEN_ANGLE_BRACKET = 54;
+  int UNARY_OPERATOR = 54;
   /** RegularExpression Id. */
-  int CLOSE_ANGLE_BRACKET = 55;
+  int BINARY_OPERATOR = 55;
   /** RegularExpression Id. */
-  int EQUALS = 56;
+  int OPEN_ANGLE_BRACKET = 56;
   /** RegularExpression Id. */
-  int NOT_EQUALS = 57;
+  int CLOSE_ANGLE_BRACKET = 57;
   /** RegularExpression Id. */
-  int GREATER_THAN = 58;
+  int EQUALS = 58;
   /** RegularExpression Id. */
-  int GREATER_THAN_OR_EQUALS = 59;
+  int NOT_EQUALS = 59;
   /** RegularExpression Id. */
-  int LESS_THAN = 60;
+  int GREATER_THAN = 60;
   /** RegularExpression Id. */
-  int LESS_THAN_OR_EQUALS = 61;
+  int GREATER_THAN_OR_EQUALS = 61;
   /** RegularExpression Id. */
-  int LINKS_TO = 62;
+  int LESS_THAN = 62;
   /** RegularExpression Id. */
-  int REGEX = 63;
+  int LESS_THAN_OR_EQUALS = 63;
   /** RegularExpression Id. */
-  int NOT_REGEX = 64;
+  int LINKS_TO = 64;
   /** RegularExpression Id. */
-  int LIKE = 65;
+  int REGEX = 65;
   /** RegularExpression Id. */
-  int NOT_LIKE = 66;
+  int NOT_REGEX = 66;
   /** RegularExpression Id. */
-  int BETWEEN = 67;
+  int LIKE = 67;
   /** RegularExpression Id. */
-  int PAGE = 68;
+  int NOT_LIKE = 68;
   /** RegularExpression Id. */
-  int SIZE = 69;
+  int BETWEEN = 69;
   /** RegularExpression Id. */
-  int ORDER = 70;
+  int PAGE = 70;
   /** RegularExpression Id. */
-  int ASC = 71;
+  int SIZE = 71;
   /** RegularExpression Id. */
-  int DESC = 72;
+  int ORDER = 72;
   /** RegularExpression Id. */
-  int PIPE = 73;
+  int ASC = 73;
   /** RegularExpression Id. */
-  int QUOTED_STRING = 74;
+  int DESC = 74;
   /** RegularExpression Id. */
-  int DOUBLE_QUOTED_STRING = 75;
+  int PIPE = 75;
   /** RegularExpression Id. */
-  int SINGLE_QUOTED_STRING = 76;
+  int QUOTED_STRING = 76;
   /** RegularExpression Id. */
-  int NUMERIC = 77;
+  int DOUBLE_QUOTED_STRING = 77;
   /** RegularExpression Id. */
-  int COMMA = 78;
+  int SINGLE_QUOTED_STRING = 78;
   /** RegularExpression Id. */
-  int SIGNED_INTEGER = 79;
+  int NUMERIC = 79;
   /** RegularExpression Id. */
-  int SIGNED_DECIMAL = 80;
+  int COMMA = 80;
   /** RegularExpression Id. */
-  int ALPHANUMERIC = 81;
+  int SIGNED_INTEGER = 81;
   /** RegularExpression Id. */
-  int PERIOD_SEPARATED_STRING = 82;
+  int SIGNED_DECIMAL = 82;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 83;
+  int ALPHANUMERIC = 83;
   /** RegularExpression Id. */
-  int NON_ALPHANUMERIC = 84;
+  int PERIOD_SEPARATED_STRING = 84;
   /** RegularExpression Id. */
-  int LETTER = 85;
+  int NON_ALPHANUMERIC_AND_ALPHANUMERIC = 85;
   /** RegularExpression Id. */
-  int DIGIT = 86;
+  int NON_ALPHANUMERIC = 86;
   /** RegularExpression Id. */
-  int PERIOD = 87;
+  int LETTER = 87;
+  /** RegularExpression Id. */
+  int DIGIT = 88;
+  /** RegularExpression Id. */
+  int PERIOD = 89;
 
   /** Lexical state. */
   int DEFAULT = 0;
@@ -201,6 +205,8 @@ public interface GrammarConstants {
     "\"select\"",
     "\"get\"",
     "\"find\"",
+    "\"findOrAdd\"",
+    "\"findOrInsert\"",
     "\"describe\"",
     "\"verify\"",
     "\"search\"",
diff --git a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
index edcdd255..03468d3f 100644
--- a/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
+++ b/src/main/java/com/cinchapi/ccl/generated/GrammarTokenManager.java
@@ -56,123 +56,123 @@ private int jjMoveStringLiteralDfa0_0(){
          jjmatchedKind = 2;
          return jjMoveNfa_0(5, 0);
       case 10:
-         jjmatchedKind = 88;
+         jjmatchedKind = 90;
          return jjMoveNfa_0(5, 0);
       case 32:
          jjmatchedKind = 1;
          return jjMoveNfa_0(5, 0);
       case 36:
-         return jjMoveStringLiteralDfa1_0(0x2000000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x8000000000000L, 0x0L);
       case 40:
-         jjmatchedKind = 43;
+         jjmatchedKind = 45;
          return jjMoveNfa_0(5, 0);
       case 41:
-         jjmatchedKind = 44;
+         jjmatchedKind = 46;
          return jjMoveNfa_0(5, 0);
       case 44:
-         jjmatchedKind = 78;
+         jjmatchedKind = 80;
          return jjMoveNfa_0(5, 0);
       case 58:
-         jjmatchedKind = 42;
+         jjmatchedKind = 44;
          return jjMoveNfa_0(5, 0);
       case 60:
-         jjmatchedKind = 54;
+         jjmatchedKind = 56;
          return jjMoveNfa_0(5, 0);
       case 61:
-         jjmatchedKind = 90;
+         jjmatchedKind = 92;
          return jjMoveNfa_0(5, 0);
       case 62:
-         jjmatchedKind = 55;
+         jjmatchedKind = 57;
          return jjMoveNfa_0(5, 0);
       case 65:
-         return jjMoveStringLiteralDfa1_0(0x3040000008L, 0x80L);
+         return jjMoveStringLiteralDfa1_0(0xc100000008L, 0x200L);
       case 66:
-         return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x100000L, 0x0L);
       case 67:
-         return jjMoveStringLiteralDfa1_0(0x28080040L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xa0200040L, 0x0L);
       case 68:
-         return jjMoveStringLiteralDfa1_0(0x108000L, 0x100L);
+         return jjMoveStringLiteralDfa1_0(0x420000L, 0x400L);
       case 70:
-         return jjMoveStringLiteralDfa1_0(0x4400004000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1100001c000L, 0x0L);
       case 71:
          return jjMoveStringLiteralDfa1_0(0x2000L, 0x0L);
       case 73:
-         return jjMoveStringLiteralDfa1_0(0x300200200L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xc00800200L, 0x0L);
       case 74:
-         return jjMoveStringLiteralDfa1_0(0x400000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x0L);
       case 76:
-         return jjMoveStringLiteralDfa1_0(0x400L, 0x2L);
+         return jjMoveStringLiteralDfa1_0(0x400L, 0x8L);
       case 78:
-         return jjMoveStringLiteralDfa1_0(0x800000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000L, 0x0L);
       case 79:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x40L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x100L);
       case 80:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x10L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x40L);
       case 82:
-         return jjMoveStringLiteralDfa1_0(0x8000000083000020L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x20c000020L, 0x2L);
       case 83:
-         return jjMoveStringLiteralDfa1_0(0x10021010L, 0x20L);
+         return jjMoveStringLiteralDfa1_0(0x40081010L, 0x80L);
       case 84:
-         return jjMoveStringLiteralDfa1_0(0x804000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2010000000L, 0x0L);
       case 85:
          return jjMoveStringLiteralDfa1_0(0x800L, 0x0L);
       case 86:
-         return jjMoveStringLiteralDfa1_0(0x10000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L);
       case 87:
-         return jjMoveStringLiteralDfa1_0(0x1008000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4020000000000L, 0x0L);
       case 91:
-         jjmatchedKind = 45;
+         jjmatchedKind = 47;
          return jjMoveNfa_0(5, 0);
       case 93:
-         jjmatchedKind = 46;
+         jjmatchedKind = 48;
          return jjMoveNfa_0(5, 0);
       case 95:
-         jjmatchedKind = 89;
+         jjmatchedKind = 91;
          return jjMoveNfa_0(5, 0);
       case 97:
-         return jjMoveStringLiteralDfa1_0(0x3040000008L, 0x80L);
+         return jjMoveStringLiteralDfa1_0(0xc100000008L, 0x200L);
       case 98:
-         return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x100000L, 0x0L);
       case 99:
-         return jjMoveStringLiteralDfa1_0(0x28080040L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xa0200040L, 0x0L);
       case 100:
-         return jjMoveStringLiteralDfa1_0(0x108000L, 0x100L);
+         return jjMoveStringLiteralDfa1_0(0x420000L, 0x400L);
       case 102:
-         return jjMoveStringLiteralDfa1_0(0x4400004000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1100001c000L, 0x0L);
       case 103:
          return jjMoveStringLiteralDfa1_0(0x2000L, 0x0L);
       case 105:
-         return jjMoveStringLiteralDfa1_0(0x300200200L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0xc00800200L, 0x0L);
       case 106:
-         return jjMoveStringLiteralDfa1_0(0x400000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x1000000L, 0x0L);
       case 108:
-         return jjMoveStringLiteralDfa1_0(0x400L, 0x2L);
+         return jjMoveStringLiteralDfa1_0(0x400L, 0x8L);
       case 110:
-         return jjMoveStringLiteralDfa1_0(0x800000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2000000L, 0x0L);
       case 111:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x40L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x100L);
       case 112:
-         return jjMoveStringLiteralDfa1_0(0x0L, 0x10L);
+         return jjMoveStringLiteralDfa1_0(0x0L, 0x40L);
       case 114:
-         return jjMoveStringLiteralDfa1_0(0x8000000083000020L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x20c000020L, 0x2L);
       case 115:
-         return jjMoveStringLiteralDfa1_0(0x10021010L, 0x20L);
+         return jjMoveStringLiteralDfa1_0(0x40081010L, 0x80L);
       case 116:
-         return jjMoveStringLiteralDfa1_0(0x804000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x2010000000L, 0x0L);
       case 117:
          return jjMoveStringLiteralDfa1_0(0x800L, 0x0L);
       case 118:
-         return jjMoveStringLiteralDfa1_0(0x10000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x40000L, 0x0L);
       case 119:
-         return jjMoveStringLiteralDfa1_0(0x1008000000000L, 0x0L);
+         return jjMoveStringLiteralDfa1_0(0x4020000000000L, 0x0L);
       case 123:
-         jjmatchedKind = 40;
+         jjmatchedKind = 42;
          return jjMoveNfa_0(5, 0);
       case 124:
-         jjmatchedKind = 73;
+         jjmatchedKind = 75;
          return jjMoveNfa_0(5, 0);
       case 125:
-         jjmatchedKind = 41;
+         jjmatchedKind = 43;
          return jjMoveNfa_0(5, 0);
       default :
          return jjMoveNfa_0(5, 0);
@@ -186,83 +186,83 @@ private int jjMoveStringLiteralDfa1_0(long active0, long active1){
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8800000L, active1, 0x10L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x22000000L, active1, 0x40L);
       case 66:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000L, active1, 0L);
       case 68:
          return jjMoveStringLiteralDfa2_0(active0, 0x8L, active1, 0L);
       case 69:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000008303b030L, active1, 0x100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x20c0e3030L, active1, 0x402L);
       case 72:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000000080000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000200000L, active1, 0L);
       case 73:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2008000104400L, active1, 0x22L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x802000041c400L, active1, 0x88L);
       case 76:
          return jjMoveStringLiteralDfa2_0(active0, 0x40L, active1, 0L);
       case 78:
-         if ((active0 & 0x100000000L) != 0L)
+         if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 34;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x200200a00L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800800a00L, active1, 0L);
       case 79:
-         if ((active0 & 0x800000000L) != 0L)
+         if ((active0 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 35;
+            jjmatchedKind = 37;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x4020000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10080000000L, active1, 0L);
       case 82:
-         return jjMoveStringLiteralDfa2_0(active0, 0x404040000L, active1, 0x40L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1010100000L, active1, 0x100L);
       case 83:
-         if ((active0 & 0x2000000000L) != 0L)
+         if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 37;
+            jjmatchedKind = 39;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000400000L, active1, 0x80L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4001000000L, active1, 0x200L);
       case 84:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000000L, active1, 0L);
       case 97:
-         return jjMoveStringLiteralDfa2_0(active0, 0x8800000L, active1, 0x10L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x22000000L, active1, 0x40L);
       case 98:
-         return jjMoveStringLiteralDfa2_0(active0, 0x40000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x100000000L, active1, 0L);
       case 100:
          return jjMoveStringLiteralDfa2_0(active0, 0x8L, active1, 0L);
       case 101:
-         return jjMoveStringLiteralDfa2_0(active0, 0x800000008303b030L, active1, 0x100L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x20c0e3030L, active1, 0x402L);
       case 104:
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000000080000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4000000200000L, active1, 0L);
       case 105:
-         return jjMoveStringLiteralDfa2_0(active0, 0x2008000104400L, active1, 0x22L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x802000041c400L, active1, 0x88L);
       case 108:
          return jjMoveStringLiteralDfa2_0(active0, 0x40L, active1, 0L);
       case 110:
-         if ((active0 & 0x100000000L) != 0L)
+         if ((active0 & 0x400000000L) != 0L)
          {
-            jjmatchedKind = 32;
+            jjmatchedKind = 34;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x200200a00L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x800800a00L, active1, 0L);
       case 111:
-         if ((active0 & 0x800000000L) != 0L)
+         if ((active0 & 0x2000000000L) != 0L)
          {
-            jjmatchedKind = 35;
+            jjmatchedKind = 37;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x4020000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x10080000000L, active1, 0L);
       case 114:
-         return jjMoveStringLiteralDfa2_0(active0, 0x404040000L, active1, 0x40L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x1010100000L, active1, 0x100L);
       case 115:
-         if ((active0 & 0x2000000000L) != 0L)
+         if ((active0 & 0x8000000000L) != 0L)
          {
-            jjmatchedKind = 37;
+            jjmatchedKind = 39;
             jjmatchedPos = 1;
          }
-         return jjMoveStringLiteralDfa2_0(active0, 0x1000400000L, active1, 0x80L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x4001000000L, active1, 0x200L);
       case 116:
-         return jjMoveStringLiteralDfa2_0(active0, 0x10000000L, active1, 0L);
+         return jjMoveStringLiteralDfa2_0(active0, 0x40000000L, active1, 0L);
       default :
          break;
    }
@@ -278,48 +278,48 @@ private int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 32:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000L, active1, 0L);
       case 65:
-         return jjMoveStringLiteralDfa3_0(active0, 0x14020000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x50080000L, active1, 0L);
       case 67:
-         if ((active1 & 0x80L) != 0L)
+         if ((active1 & 0x200L) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 73;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000L, active1, 0L);
       case 68:
          if ((active0 & 0x8L) != 0L)
          {
             jjmatchedKind = 3;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x40L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0x100L);
       case 69:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000040L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000040L, active1, 0L);
       case 70:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000L, active1, 0L);
       case 71:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0x10L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x42L);
       case 75:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8L);
       case 76:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8001800L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20001800L, active1, 0L);
       case 77:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000020L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000020L, active1, 0L);
       case 78:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4400L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1c400L, active1, 0L);
       case 79:
-         return jjMoveStringLiteralDfa3_0(active0, 0x440440000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1101100000L, active1, 0L);
       case 82:
-         if ((active0 & 0x4000000000L) != 0L)
+         if ((active0 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 38;
+            jjmatchedKind = 40;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x90000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x240000L, active1, 0L);
       case 83:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8200L, active1, 0x100L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20200L, active1, 0x400L);
       case 84:
          if ((active0 & 0x10L) != 0L)
          {
@@ -331,52 +331,52 @@ else if ((active0 & 0x2000L) != 0L)
             jjmatchedKind = 13;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x8200000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20800000000L, active1, 0L);
       case 86:
-         return jjMoveStringLiteralDfa3_0(active0, 0x82a00000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20a800000L, active1, 0L);
       case 90:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80L);
       case 97:
-         return jjMoveStringLiteralDfa3_0(active0, 0x14020000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x50080000L, active1, 0L);
       case 99:
-         if ((active1 & 0x80L) != 0L)
+         if ((active1 & 0x200L) != 0L)
          {
-            jjmatchedKind = 71;
+            jjmatchedKind = 73;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000L, active1, 0L);
       case 100:
          if ((active0 & 0x8L) != 0L)
          {
             jjmatchedKind = 3;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x2000000000000L, active1, 0x40L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000L, active1, 0x100L);
       case 101:
-         return jjMoveStringLiteralDfa3_0(active0, 0x1000000000040L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x4000000000040L, active1, 0L);
       case 102:
-         return jjMoveStringLiteralDfa3_0(active0, 0x100000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x400000L, active1, 0L);
       case 103:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8000000000000000L, active1, 0x10L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x42L);
       case 107:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x2L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x8L);
       case 108:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8001800L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20001800L, active1, 0L);
       case 109:
-         return jjMoveStringLiteralDfa3_0(active0, 0x20000020L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x80000020L, active1, 0L);
       case 110:
-         return jjMoveStringLiteralDfa3_0(active0, 0x4400L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1c400L, active1, 0L);
       case 111:
-         return jjMoveStringLiteralDfa3_0(active0, 0x440440000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x1101100000L, active1, 0L);
       case 114:
-         if ((active0 & 0x4000000000L) != 0L)
+         if ((active0 & 0x10000000000L) != 0L)
          {
-            jjmatchedKind = 38;
+            jjmatchedKind = 40;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x90000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x240000L, active1, 0L);
       case 115:
-         return jjMoveStringLiteralDfa3_0(active0, 0x8200L, active1, 0x100L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20200L, active1, 0x400L);
       case 116:
          if ((active0 & 0x10L) != 0L)
          {
@@ -388,11 +388,11 @@ else if ((active0 & 0x2000L) != 0L)
             jjmatchedKind = 13;
             jjmatchedPos = 2;
          }
-         return jjMoveStringLiteralDfa3_0(active0, 0x8200000000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20800000000L, active1, 0L);
       case 118:
-         return jjMoveStringLiteralDfa3_0(active0, 0x82a00000L, active1, 0L);
+         return jjMoveStringLiteralDfa3_0(active0, 0x20a800000L, active1, 0L);
       case 122:
-         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x20L);
+         return jjMoveStringLiteralDfa3_0(active0, 0L, active1, 0x80L);
       default :
          break;
    }
@@ -408,63 +408,63 @@ private int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 36:
-         if ((active0 & 0x2000000000000L) != 0L)
+         if ((active0 & 0x8000000000000L) != 0L)
          {
-            jjmatchedKind = 49;
+            jjmatchedKind = 51;
             jjmatchedPos = 3;
          }
          break;
       case 65:
          return jjMoveStringLiteralDfa4_0(active0, 0x40L, active1, 0L);
       case 67:
-         if ((active1 & 0x100L) != 0L)
+         if ((active1 & 0x400L) != 0L)
          {
-            jjmatchedKind = 72;
+            jjmatchedKind = 74;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0xc008000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x30020000L, active1, 0L);
       case 68:
          if ((active0 & 0x4000L) != 0L)
          {
             jjmatchedKind = 14;
             jjmatchedPos = 3;
          }
-         break;
+         return jjMoveStringLiteralDfa4_0(active0, 0x18000L, active1, 0L);
       case 69:
-         if ((active1 & 0x2L) != 0L)
+         if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 67;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x10L) != 0L)
+         else if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 70;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x20L) != 0L)
+         else if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 71;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000080201200L, active1, 0x40L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200801200L, active1, 0x102L);
       case 70:
-         if ((active0 & 0x100000L) != 0L)
+         if ((active0 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 20;
+            jjmatchedKind = 22;
             jjmatchedPos = 3;
          }
          break;
       case 71:
-         return jjMoveStringLiteralDfa4_0(active0, 0x10000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000L, active1, 0L);
       case 72:
-         if ((active0 & 0x8000000000L) != 0L)
+         if ((active0 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 41;
             jjmatchedPos = 3;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2810800L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0xa040800L, active1, 0L);
       case 75:
          if ((active0 & 0x400L) != 0L)
          {
@@ -473,76 +473,76 @@ else if ((active1 & 0x20L) != 0L)
          }
          break;
       case 77:
-         if ((active0 & 0x400000000L) != 0L)
+         if ((active0 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 34;
+            jjmatchedKind = 36;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000L, active1, 0L);
       case 78:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0L);
       case 79:
-         if ((active0 & 0x200000000L) != 0L)
+         if ((active0 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 33;
+            jjmatchedKind = 35;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1001080020L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4004200020L, active1, 0L);
       case 82:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000040020000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000100080000L, active1, 0L);
       case 87:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L);
       case 97:
          return jjMoveStringLiteralDfa4_0(active0, 0x40L, active1, 0L);
       case 99:
-         if ((active1 & 0x100L) != 0L)
+         if ((active1 & 0x400L) != 0L)
          {
-            jjmatchedKind = 72;
+            jjmatchedKind = 74;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0xc008000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x30020000L, active1, 0L);
       case 100:
          if ((active0 & 0x4000L) != 0L)
          {
             jjmatchedKind = 14;
             jjmatchedPos = 3;
          }
-         break;
+         return jjMoveStringLiteralDfa4_0(active0, 0x18000L, active1, 0L);
       case 101:
-         if ((active1 & 0x2L) != 0L)
+         if ((active1 & 0x8L) != 0L)
          {
-            jjmatchedKind = 65;
+            jjmatchedKind = 67;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x10L) != 0L)
+         else if ((active1 & 0x40L) != 0L)
          {
-            jjmatchedKind = 68;
+            jjmatchedKind = 70;
             jjmatchedPos = 3;
          }
-         else if ((active1 & 0x20L) != 0L)
+         else if ((active1 & 0x80L) != 0L)
          {
-            jjmatchedKind = 69;
+            jjmatchedKind = 71;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x8000000080201200L, active1, 0x40L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x200801200L, active1, 0x102L);
       case 102:
-         if ((active0 & 0x100000L) != 0L)
+         if ((active0 & 0x400000L) != 0L)
          {
-            jjmatchedKind = 20;
+            jjmatchedKind = 22;
             jjmatchedPos = 3;
          }
          break;
       case 103:
-         return jjMoveStringLiteralDfa4_0(active0, 0x10000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x40000000L, active1, 0L);
       case 104:
-         if ((active0 & 0x8000000000L) != 0L)
+         if ((active0 & 0x20000000000L) != 0L)
          {
-            jjmatchedKind = 39;
+            jjmatchedKind = 41;
             jjmatchedPos = 3;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa4_0(active0, 0x2810800L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0xa040800L, active1, 0L);
       case 107:
          if ((active0 & 0x400L) != 0L)
          {
@@ -551,25 +551,25 @@ else if ((active1 & 0x20L) != 0L)
          }
          break;
       case 109:
-         if ((active0 & 0x400000000L) != 0L)
+         if ((active0 & 0x1000000000L) != 0L)
          {
-            jjmatchedKind = 34;
+            jjmatchedKind = 36;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x20000000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x80000000L, active1, 0L);
       case 110:
-         return jjMoveStringLiteralDfa4_0(active0, 0x400000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x1000000L, active1, 0L);
       case 111:
-         if ((active0 & 0x200000000L) != 0L)
+         if ((active0 & 0x800000000L) != 0L)
          {
-            jjmatchedKind = 33;
+            jjmatchedKind = 35;
             jjmatchedPos = 3;
          }
-         return jjMoveStringLiteralDfa4_0(active0, 0x1001080020L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4004200020L, active1, 0L);
       case 114:
-         return jjMoveStringLiteralDfa4_0(active0, 0x1000040020000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x4000100080000L, active1, 0L);
       case 119:
-         return jjMoveStringLiteralDfa4_0(active0, 0x40000L, active1, 0L);
+         return jjMoveStringLiteralDfa4_0(active0, 0x100000L, active1, 0L);
       default :
          break;
    }
@@ -585,120 +585,124 @@ private int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 67:
-         return jjMoveStringLiteralDfa5_0(active0, 0x21000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x81000L, active1, 0L);
       case 69:
-         if ((active0 & 0x4000000L) != 0L)
+         if ((active0 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 26;
+            jjmatchedKind = 28;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x10000000L) != 0L)
+         else if ((active0 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 30;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x1000000000000L) != 0L)
+         else if ((active0 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 48;
+            jjmatchedKind = 50;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000L, active1, 0L);
       case 70:
-         if ((active0 & 0x1000000000L) != 0L)
+         if ((active0 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 36;
+            jjmatchedKind = 38;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x10000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000L, active1, 0L);
       case 71:
-         return jjMoveStringLiteralDfa5_0(active0, 0x800000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000L, active1, 0L);
       case 73:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20400000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x81000000L, active1, 0L);
       case 78:
-         return jjMoveStringLiteralDfa5_0(active0, 0x1280800L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4a00800L, active1, 0L);
+      case 79:
+         return jjMoveStringLiteralDfa5_0(active0, 0x18000L, active1, 0L);
       case 82:
          if ((active0 & 0x40L) != 0L)
          {
             jjmatchedKind = 6;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x80008200L, active1, 0x40L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200020200L, active1, 0x100L);
       case 83:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000L, active1, 0L);
       case 84:
-         if ((active0 & 0x40000000L) != 0L)
+         if ((active0 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 32;
             jjmatchedPos = 4;
          }
          break;
       case 85:
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000000L, active1, 0L);
       case 86:
          return jjMoveStringLiteralDfa5_0(active0, 0x20L, active1, 0L);
       case 88:
-         if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 65;
             jjmatchedPos = 4;
          }
          break;
       case 99:
-         return jjMoveStringLiteralDfa5_0(active0, 0x21000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x81000L, active1, 0L);
       case 101:
-         if ((active0 & 0x4000000L) != 0L)
+         if ((active0 & 0x10000000L) != 0L)
          {
-            jjmatchedKind = 26;
+            jjmatchedKind = 28;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x10000000L) != 0L)
+         else if ((active0 & 0x40000000L) != 0L)
          {
-            jjmatchedKind = 28;
+            jjmatchedKind = 30;
             jjmatchedPos = 4;
          }
-         else if ((active0 & 0x1000000000000L) != 0L)
+         else if ((active0 & 0x4000000000000L) != 0L)
          {
-            jjmatchedKind = 48;
+            jjmatchedKind = 50;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x2000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x8000000L, active1, 0L);
       case 102:
-         if ((active0 & 0x1000000000L) != 0L)
+         if ((active0 & 0x4000000000L) != 0L)
          {
-            jjmatchedKind = 36;
+            jjmatchedKind = 38;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x10000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x40000L, active1, 0L);
       case 103:
-         return jjMoveStringLiteralDfa5_0(active0, 0x800000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x2000000L, active1, 0L);
       case 105:
-         return jjMoveStringLiteralDfa5_0(active0, 0x20400000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x81000000L, active1, 0L);
       case 110:
-         return jjMoveStringLiteralDfa5_0(active0, 0x1280800L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x4a00800L, active1, 0L);
+      case 111:
+         return jjMoveStringLiteralDfa5_0(active0, 0x18000L, active1, 0L);
       case 114:
          if ((active0 & 0x40L) != 0L)
          {
             jjmatchedKind = 6;
             jjmatchedPos = 4;
          }
-         return jjMoveStringLiteralDfa5_0(active0, 0x80008200L, active1, 0x40L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x200020200L, active1, 0x100L);
       case 115:
-         return jjMoveStringLiteralDfa5_0(active0, 0x40000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x100000L, active1, 0L);
       case 116:
-         if ((active0 & 0x40000000L) != 0L)
+         if ((active0 & 0x100000000L) != 0L)
          {
-            jjmatchedKind = 30;
+            jjmatchedKind = 32;
             jjmatchedPos = 4;
          }
          break;
       case 117:
-         return jjMoveStringLiteralDfa5_0(active0, 0x8000000L, active1, 0L);
+         return jjMoveStringLiteralDfa5_0(active0, 0x20000000L, active1, 0L);
       case 118:
          return jjMoveStringLiteralDfa5_0(active0, 0x20L, active1, 0L);
       case 120:
-         if ((active0 & 0x8000000000000000L) != 0L)
+         if ((active1 & 0x2L) != 0L)
          {
-            jjmatchedKind = 63;
+            jjmatchedKind = 65;
             jjmatchedPos = 4;
          }
          break;
@@ -717,34 +721,34 @@ private int jjMoveStringLiteralDfa5_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 32:
-         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x40L);
+         return jjMoveStringLiteralDfa6_0(active0, 0L, active1, 0x100L);
       case 65:
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0L);
       case 67:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L);
       case 69:
          if ((active0 & 0x20L) != 0L)
          {
             jjmatchedKind = 5;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x40000L) != 0L)
+         else if ((active0 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 18;
+            jjmatchedKind = 20;
             jjmatchedPos = 5;
          }
          break;
       case 70:
-         return jjMoveStringLiteralDfa6_0(active0, 0x400000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0L);
       case 72:
-         if ((active0 & 0x20000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 17;
+            jjmatchedKind = 19;
             jjmatchedPos = 5;
          }
          break;
       case 73:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000L, active1, 0L);
       case 75:
          if ((active0 & 0x800L) != 0L)
          {
@@ -753,9 +757,11 @@ else if ((active0 & 0x40000L) != 0L)
          }
          break;
       case 76:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000000L, active1, 0L);
       case 79:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0L);
+      case 82:
+         return jjMoveStringLiteralDfa6_0(active0, 0x18000L, active1, 0L);
       case 84:
          if ((active0 & 0x200L) != 0L)
          {
@@ -767,58 +773,58 @@ else if ((active0 & 0x1000L) != 0L)
             jjmatchedKind = 12;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x20000000L) != 0L)
+         else if ((active0 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 29;
+            jjmatchedKind = 31;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x80000000L) != 0L)
+         else if ((active0 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 31;
+            jjmatchedKind = 33;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0L);
       case 87:
-         if ((active0 & 0x2000000L) != 0L)
+         if ((active0 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 25;
+            jjmatchedKind = 27;
             jjmatchedPos = 5;
          }
          break;
       case 89:
-         if ((active0 & 0x10000L) != 0L)
+         if ((active0 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 16;
+            jjmatchedKind = 18;
             jjmatchedPos = 5;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x2000000L, active1, 0L);
       case 99:
-         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x4000000L, active1, 0L);
       case 101:
          if ((active0 & 0x20L) != 0L)
          {
             jjmatchedKind = 5;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x40000L) != 0L)
+         else if ((active0 & 0x100000L) != 0L)
          {
-            jjmatchedKind = 18;
+            jjmatchedKind = 20;
             jjmatchedPos = 5;
          }
          break;
       case 102:
-         return jjMoveStringLiteralDfa6_0(active0, 0x400000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x1000000L, active1, 0L);
       case 104:
-         if ((active0 & 0x20000L) != 0L)
+         if ((active0 & 0x80000L) != 0L)
          {
-            jjmatchedKind = 17;
+            jjmatchedKind = 19;
             jjmatchedPos = 5;
          }
          break;
       case 105:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000L, active1, 0L);
       case 107:
          if ((active0 & 0x800L) != 0L)
          {
@@ -827,9 +833,11 @@ else if ((active0 & 0x40000L) != 0L)
          }
          break;
       case 108:
-         return jjMoveStringLiteralDfa6_0(active0, 0x8000000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x20000000L, active1, 0L);
       case 111:
-         return jjMoveStringLiteralDfa6_0(active0, 0x80000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0L);
+      case 114:
+         return jjMoveStringLiteralDfa6_0(active0, 0x18000L, active1, 0L);
       case 116:
          if ((active0 & 0x200L) != 0L)
          {
@@ -841,28 +849,28 @@ else if ((active0 & 0x1000L) != 0L)
             jjmatchedKind = 12;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x20000000L) != 0L)
+         else if ((active0 & 0x80000000L) != 0L)
          {
-            jjmatchedKind = 29;
+            jjmatchedKind = 31;
             jjmatchedPos = 5;
          }
-         else if ((active0 & 0x80000000L) != 0L)
+         else if ((active0 & 0x200000000L) != 0L)
          {
-            jjmatchedKind = 31;
+            jjmatchedKind = 33;
             jjmatchedPos = 5;
          }
-         return jjMoveStringLiteralDfa6_0(active0, 0x200000L, active1, 0L);
+         return jjMoveStringLiteralDfa6_0(active0, 0x800000L, active1, 0L);
       case 119:
-         if ((active0 & 0x2000000L) != 0L)
+         if ((active0 & 0x8000000L) != 0L)
          {
-            jjmatchedKind = 25;
+            jjmatchedKind = 27;
             jjmatchedPos = 5;
          }
          break;
       case 121:
-         if ((active0 & 0x10000L) != 0L)
+         if ((active0 & 0x40000L) != 0L)
          {
-            jjmatchedKind = 16;
+            jjmatchedKind = 18;
             jjmatchedPos = 5;
          }
          break;
@@ -881,40 +889,40 @@ private int jjMoveStringLiteralDfa6_0(long old0, long active0, long old1, long a
    switch(curChar)
    {
       case 65:
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20008000L, active1, 0L);
       case 66:
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000L, active1, 0x40L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20000L, active1, 0x100L);
       case 73:
-         return jjMoveStringLiteralDfa7_0(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x4010000L, active1, 0L);
       case 76:
-         return jjMoveStringLiteralDfa7_0(active0, 0x80000L, active1, 0L);
-      case 79:
          return jjMoveStringLiteralDfa7_0(active0, 0x200000L, active1, 0L);
-      case 84:
+      case 79:
          return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0L);
+      case 84:
+         return jjMoveStringLiteralDfa7_0(active0, 0x2000000L, active1, 0L);
       case 89:
-         if ((active0 & 0x400000L) != 0L)
+         if ((active0 & 0x1000000L) != 0L)
          {
-            jjmatchedKind = 22;
+            jjmatchedKind = 24;
             jjmatchedPos = 6;
          }
          break;
       case 97:
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20008000L, active1, 0L);
       case 98:
-         return jjMoveStringLiteralDfa7_0(active0, 0x8000L, active1, 0x40L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x20000L, active1, 0x100L);
       case 105:
-         return jjMoveStringLiteralDfa7_0(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa7_0(active0, 0x4010000L, active1, 0L);
       case 108:
-         return jjMoveStringLiteralDfa7_0(active0, 0x80000L, active1, 0L);
-      case 111:
          return jjMoveStringLiteralDfa7_0(active0, 0x200000L, active1, 0L);
-      case 116:
+      case 111:
          return jjMoveStringLiteralDfa7_0(active0, 0x800000L, active1, 0L);
+      case 116:
+         return jjMoveStringLiteralDfa7_0(active0, 0x2000000L, active1, 0L);
       case 121:
-         if ((active0 & 0x400000L) != 0L)
+         if ((active0 & 0x1000000L) != 0L)
          {
-            jjmatchedKind = 22;
+            jjmatchedKind = 24;
             jjmatchedPos = 6;
          }
          break;
@@ -932,57 +940,65 @@ private int jjMoveStringLiteralDfa7_0(long old0, long active0, long old1, long a
    }
    switch(curChar)
    {
+      case 68:
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000L, active1, 0L);
       case 69:
-         if ((active0 & 0x8000L) != 0L)
+         if ((active0 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 17;
             jjmatchedPos = 7;
          }
-         else if ((active0 & 0x800000L) != 0L)
+         else if ((active0 & 0x2000000L) != 0L)
          {
-            jjmatchedKind = 23;
+            jjmatchedKind = 25;
             jjmatchedPos = 7;
          }
          break;
       case 76:
-         return jjMoveStringLiteralDfa8_0(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x4000000L, active1, 0L);
+      case 78:
+         return jjMoveStringLiteralDfa8_0(active0, 0x10000L, active1, 0L);
       case 79:
-         return jjMoveStringLiteralDfa8_0(active0, 0x80000L, active1, 0L);
-      case 82:
          return jjMoveStringLiteralDfa8_0(active0, 0x200000L, active1, 0L);
+      case 82:
+         return jjMoveStringLiteralDfa8_0(active0, 0x800000L, active1, 0L);
       case 84:
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000L, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x20000000L, active1, 0L);
       case 89:
-         if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 72;
             jjmatchedPos = 7;
          }
          break;
+      case 100:
+         return jjMoveStringLiteralDfa8_0(active0, 0x8000L, active1, 0L);
       case 101:
-         if ((active0 & 0x8000L) != 0L)
+         if ((active0 & 0x20000L) != 0L)
          {
-            jjmatchedKind = 15;
+            jjmatchedKind = 17;
             jjmatchedPos = 7;
          }
-         else if ((active0 & 0x800000L) != 0L)
+         else if ((active0 & 0x2000000L) != 0L)
          {
-            jjmatchedKind = 23;
+            jjmatchedKind = 25;
             jjmatchedPos = 7;
          }
          break;
       case 108:
-         return jjMoveStringLiteralDfa8_0(active0, 0x1000000L, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x4000000L, active1, 0L);
+      case 110:
+         return jjMoveStringLiteralDfa8_0(active0, 0x10000L, active1, 0L);
       case 111:
-         return jjMoveStringLiteralDfa8_0(active0, 0x80000L, active1, 0L);
-      case 114:
          return jjMoveStringLiteralDfa8_0(active0, 0x200000L, active1, 0L);
+      case 114:
+         return jjMoveStringLiteralDfa8_0(active0, 0x800000L, active1, 0L);
       case 116:
-         return jjMoveStringLiteralDfa8_0(active0, 0x8000000L, active1, 0L);
+         return jjMoveStringLiteralDfa8_0(active0, 0x20000000L, active1, 0L);
       case 121:
-         if ((active1 & 0x40L) != 0L)
+         if ((active1 & 0x100L) != 0L)
          {
-            jjmatchedKind = 70;
+            jjmatchedKind = 72;
             jjmatchedPos = 7;
          }
          break;
@@ -1000,45 +1016,63 @@ private int jjMoveStringLiteralDfa8_0(long old0, long active0, long old1, long a
    }
    switch(curChar)
    {
+      case 68:
+         if ((active0 & 0x8000L) != 0L)
+         {
+            jjmatchedKind = 15;
+            jjmatchedPos = 8;
+         }
+         break;
       case 69:
-         if ((active0 & 0x1000000L) != 0L)
+         if ((active0 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 24;
+            jjmatchedKind = 26;
             jjmatchedPos = 8;
          }
-         else if ((active0 & 0x8000000L) != 0L)
+         else if ((active0 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 27;
+            jjmatchedKind = 29;
             jjmatchedPos = 8;
          }
          break;
       case 71:
-         return jjMoveStringLiteralDfa9_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x200000L);
+      case 83:
+         return jjMoveStringLiteralDfa9_0(active0, 0x10000L);
       case 89:
-         if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 21;
+            jjmatchedKind = 23;
+            jjmatchedPos = 8;
+         }
+         break;
+      case 100:
+         if ((active0 & 0x8000L) != 0L)
+         {
+            jjmatchedKind = 15;
             jjmatchedPos = 8;
          }
          break;
       case 101:
-         if ((active0 & 0x1000000L) != 0L)
+         if ((active0 & 0x4000000L) != 0L)
          {
-            jjmatchedKind = 24;
+            jjmatchedKind = 26;
             jjmatchedPos = 8;
          }
-         else if ((active0 & 0x8000000L) != 0L)
+         else if ((active0 & 0x20000000L) != 0L)
          {
-            jjmatchedKind = 27;
+            jjmatchedKind = 29;
             jjmatchedPos = 8;
          }
          break;
       case 103:
-         return jjMoveStringLiteralDfa9_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa9_0(active0, 0x200000L);
+      case 115:
+         return jjMoveStringLiteralDfa9_0(active0, 0x10000L);
       case 121:
-         if ((active0 & 0x200000L) != 0L)
+         if ((active0 & 0x800000L) != 0L)
          {
-            jjmatchedKind = 21;
+            jjmatchedKind = 23;
             jjmatchedPos = 8;
          }
          break;
@@ -1056,10 +1090,14 @@ private int jjMoveStringLiteralDfa9_0(long old0, long active0){
    }
    switch(curChar)
    {
+      case 69:
+         return jjMoveStringLiteralDfa10_0(active0, 0x10000L);
       case 73:
-         return jjMoveStringLiteralDfa10_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x200000L);
+      case 101:
+         return jjMoveStringLiteralDfa10_0(active0, 0x10000L);
       case 105:
-         return jjMoveStringLiteralDfa10_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa10_0(active0, 0x200000L);
       default :
          break;
    }
@@ -1074,10 +1112,14 @@ private int jjMoveStringLiteralDfa10_0(long old0, long active0){
    }
    switch(curChar)
    {
+      case 82:
+         return jjMoveStringLiteralDfa11_0(active0, 0x10000L);
       case 90:
-         return jjMoveStringLiteralDfa11_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x200000L);
+      case 114:
+         return jjMoveStringLiteralDfa11_0(active0, 0x10000L);
       case 122:
-         return jjMoveStringLiteralDfa11_0(active0, 0x80000L);
+         return jjMoveStringLiteralDfa11_0(active0, 0x200000L);
       default :
          break;
    }
@@ -1093,16 +1135,30 @@ private int jjMoveStringLiteralDfa11_0(long old0, long active0){
    switch(curChar)
    {
       case 69:
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 19;
+            jjmatchedKind = 21;
+            jjmatchedPos = 11;
+         }
+         break;
+      case 84:
+         if ((active0 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 16;
             jjmatchedPos = 11;
          }
          break;
       case 101:
-         if ((active0 & 0x80000L) != 0L)
+         if ((active0 & 0x200000L) != 0L)
          {
-            jjmatchedKind = 19;
+            jjmatchedKind = 21;
+            jjmatchedPos = 11;
+         }
+         break;
+      case 116:
+         if ((active0 & 0x10000L) != 0L)
+         {
+            jjmatchedKind = 16;
             jjmatchedPos = 11;
          }
          break;
@@ -1166,19 +1222,19 @@ private int jjMoveNfa_0(int startState, int curPos)
                case 5:
                   if ((0xdfffecfeffffd9ffL & l) != 0L)
                   {
-                     if (kind > 83)
-                        kind = 83;
+                     if (kind > 85)
+                        kind = 85;
                      { jjCheckNAddTwoStates(18, 19); }
                   }
                   else if (curChar == 61)
                   {
-                     if (kind > 52)
-                        kind = 52;
+                     if (kind > 54)
+                        kind = 54;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 81)
-                        kind = 81;
+                     if (kind > 83)
+                        kind = 83;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0x280000000000L & l) != 0L)
@@ -1197,13 +1253,13 @@ else if (curChar == 61)
                      { jjCheckNAdd(11); }
                   else if (curChar == 38)
                   {
-                     if (kind > 50)
-                        kind = 50;
+                     if (kind > 52)
+                        kind = 52;
                   }
                   if ((0x3ff000000000000L & l) != 0L)
                   {
-                     if (kind > 77)
-                        kind = 77;
+                     if (kind > 79)
+                        kind = 79;
                      { jjCheckNAddStates(16, 21); }
                   }
                   else if (curChar == 45)
@@ -1212,28 +1268,28 @@ else if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 6;
                   break;
                case 6:
-                  if (curChar == 38 && kind > 50)
-                     kind = 50;
+                  if (curChar == 38 && kind > 52)
+                     kind = 52;
                   break;
                case 7:
                   if (curChar == 38)
                      jjstateSet[jjnewStateCnt++] = 6;
                   break;
                case 8:
-                  if (curChar == 38 && kind > 50)
-                     kind = 50;
+                  if (curChar == 38 && kind > 52)
+                     kind = 52;
                   break;
                case 11:
-                  if (curChar == 61 && kind > 52)
-                     kind = 52;
+                  if (curChar == 61 && kind > 54)
+                     kind = 54;
                   break;
                case 12:
                   if (curChar == 61)
                      { jjCheckNAdd(11); }
                   break;
                case 13:
-                  if (curChar == 61 && kind > 52)
-                     kind = 52;
+                  if (curChar == 61 && kind > 54)
+                     kind = 54;
                   break;
                case 14:
                   if (curChar == 33)
@@ -1244,8 +1300,8 @@ else if (curChar == 38)
                      { jjCheckNAdd(11); }
                   break;
                case 16:
-                  if (curChar == 62 && kind > 62)
-                     kind = 62;
+                  if (curChar == 62 && kind > 64)
+                     kind = 64;
                   break;
                case 17:
                   if (curChar == 45)
@@ -1254,15 +1310,15 @@ else if (curChar == 38)
                case 18:
                   if ((0xdfffecfeffffd9ffL & l) == 0L)
                      break;
-                  if (kind > 83)
-                     kind = 83;
+                  if (kind > 85)
+                     kind = 85;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 19:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 83)
-                     kind = 83;
+                  if (kind > 85)
+                     kind = 85;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 77:
@@ -1270,8 +1326,8 @@ else if (curChar == 38)
                      { jjCheckNAddTwoStates(11, 78); }
                   break;
                case 78:
-                  if (curChar == 60 && kind > 53)
-                     kind = 53;
+                  if (curChar == 60 && kind > 55)
+                     kind = 55;
                   break;
                case 81:
                case 82:
@@ -1293,8 +1349,8 @@ else if (curChar == 38)
                      { jjCheckNAddStates(28, 30); }
                   break;
                case 92:
-                  if (curChar == 34 && kind > 74)
-                     kind = 74;
+                  if (curChar == 34 && kind > 76)
+                     kind = 76;
                   break;
                case 94:
                   { jjCheckNAddStates(31, 33); }
@@ -1304,8 +1360,8 @@ else if (curChar == 38)
                      { jjCheckNAddStates(31, 33); }
                   break;
                case 96:
-                  if (curChar == 34 && kind > 75)
-                     kind = 75;
+                  if (curChar == 34 && kind > 77)
+                     kind = 77;
                   break;
                case 99:
                case 100:
@@ -1335,8 +1391,8 @@ else if (curChar == 38)
                      { jjCheckNAddStates(46, 48); }
                   break;
                case 119:
-                  if (curChar == 39 && kind > 74)
-                     kind = 74;
+                  if (curChar == 39 && kind > 76)
+                     kind = 76;
                   break;
                case 121:
                   { jjCheckNAddStates(49, 51); }
@@ -1346,28 +1402,28 @@ else if (curChar == 38)
                      { jjCheckNAddStates(49, 51); }
                   break;
                case 123:
-                  if (curChar == 39 && kind > 76)
-                     kind = 76;
+                  if (curChar == 39 && kind > 78)
+                     kind = 78;
                   break;
                case 124:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 79)
+                     kind = 79;
                   { jjCheckNAddStates(16, 21); }
                   break;
                case 125:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 77)
-                     kind = 77;
+                  if (kind > 79)
+                     kind = 79;
                   { jjCheckNAdd(125); }
                   break;
                case 126:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 79)
-                     kind = 79;
+                  if (kind > 81)
+                     kind = 81;
                   { jjCheckNAdd(126); }
                   break;
                case 127:
@@ -1381,8 +1437,8 @@ else if (curChar == 38)
                case 129:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 80)
-                     kind = 80;
+                  if (kind > 82)
+                     kind = 82;
                   { jjCheckNAdd(129); }
                   break;
                case 130:
@@ -1396,8 +1452,8 @@ else if (curChar == 38)
                case 132:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 84)
+                     kind = 84;
                   { jjCheckNAddTwoStates(132, 133); }
                   break;
                case 133:
@@ -1419,15 +1475,15 @@ else if (curChar == 38)
                case 137:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 84)
+                     kind = 84;
                   { jjCheckNAddTwoStates(133, 137); }
                   break;
                case 138:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 84)
+                     kind = 84;
                   { jjCheckNAddTwoStates(133, 138); }
                   break;
                case 139:
@@ -1437,27 +1493,27 @@ else if (curChar == 38)
                case 140:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 83)
+                     kind = 83;
                   { jjCheckNAddStates(0, 4); }
                   break;
                case 141:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 83)
+                     kind = 83;
                   { jjCheckNAdd(141); }
                   break;
                case 142:
                   if ((0x3ff000000000000L & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 84)
+                     kind = 84;
                   { jjCheckNAddTwoStates(142, 133); }
                   break;
                case 200:
-                  if (curChar == 50 && kind > 62)
-                     kind = 62;
+                  if (curChar == 50 && kind > 64)
+                     kind = 64;
                   break;
                default : break;
             }
@@ -1473,14 +1529,14 @@ else if (curChar < 128)
                case 5:
                   if ((0x7fffffe87fffffeL & l) != 0L)
                   {
-                     if (kind > 81)
-                        kind = 81;
+                     if (kind > 83)
+                        kind = 83;
                      { jjCheckNAddStates(0, 4); }
                   }
                   else if ((0xf800000150000001L & l) != 0L)
                   {
-                     if (kind > 83)
-                        kind = 83;
+                     if (kind > 85)
+                        kind = 85;
                      { jjCheckNAddTwoStates(18, 19); }
                   }
                   if ((0x40000000400000L & l) != 0L)
@@ -1507,8 +1563,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 9;
                   break;
                case 0:
-                  if ((0x8000000080L & l) != 0L && kind > 47)
-                     kind = 47;
+                  if ((0x8000000080L & l) != 0L && kind > 49)
+                     kind = 49;
                   break;
                case 1:
                   if ((0x400000004000L & l) != 0L)
@@ -1527,8 +1583,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 3;
                   break;
                case 9:
-                  if (curChar == 124 && kind > 51)
-                     kind = 51;
+                  if (curChar == 124 && kind > 53)
+                     kind = 53;
                   break;
                case 10:
                   if (curChar == 124)
@@ -1537,15 +1593,15 @@ else if (curChar == 124)
                case 18:
                   if ((0xf800000150000001L & l) == 0L)
                      break;
-                  if (kind > 83)
-                     kind = 83;
+                  if (kind > 85)
+                     kind = 85;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 19:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 83)
-                     kind = 83;
+                  if (kind > 85)
+                     kind = 85;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 20:
@@ -1553,12 +1609,12 @@ else if (curChar == 124)
                      { jjAddStates(82, 83); }
                   break;
                case 21:
-                  if ((0x80000000800000L & l) != 0L && kind > 53)
-                     kind = 53;
+                  if ((0x80000000800000L & l) != 0L && kind > 55)
+                     kind = 55;
                   break;
                case 22:
-                  if ((0x400000004000L & l) != 0L && kind > 53)
-                     kind = 53;
+                  if ((0x400000004000L & l) != 0L && kind > 55)
+                     kind = 55;
                   break;
                case 23:
                   if ((0x2000000020L & l) != 0L)
@@ -1585,8 +1641,8 @@ else if (curChar == 124)
                      { jjAddStates(80, 81); }
                   break;
                case 29:
-                  if ((0x8000000080000L & l) != 0L && kind > 52)
-                     kind = 52;
+                  if ((0x8000000080000L & l) != 0L && kind > 54)
+                     kind = 54;
                   break;
                case 30:
                case 48:
@@ -1608,16 +1664,16 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 32;
                   break;
                case 34:
-                  if ((0x2000000020000L & l) != 0L && kind > 52)
-                     kind = 52;
+                  if ((0x2000000020000L & l) != 0L && kind > 54)
+                     kind = 54;
                   break;
                case 35:
                   if ((0x8000000080L & l) != 0L)
                      { jjCheckNAddStates(76, 79); }
                   break;
                case 36:
-                  if ((0x400000004000L & l) != 0L && kind > 52)
-                     kind = 52;
+                  if ((0x400000004000L & l) != 0L && kind > 54)
+                     kind = 54;
                   break;
                case 37:
                case 175:
@@ -1661,8 +1717,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 45;
                   break;
                case 47:
-                  if ((0x10000000100000L & l) != 0L && kind > 52)
-                     kind = 52;
+                  if ((0x10000000100000L & l) != 0L && kind > 54)
+                     kind = 54;
                   break;
                case 49:
                   if ((0x200000002L & l) != 0L)
@@ -1741,8 +1797,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 66;
                   break;
                case 68:
-                  if ((0x2000000020L & l) != 0L && kind > 52)
-                     kind = 52;
+                  if ((0x2000000020L & l) != 0L && kind > 54)
+                     kind = 54;
                   break;
                case 69:
                case 199:
@@ -1754,12 +1810,12 @@ else if (curChar == 124)
                      { jjAddStates(74, 75); }
                   break;
                case 71:
-                  if ((0x10000000100000L & l) != 0L && kind > 47)
-                     kind = 47;
+                  if ((0x10000000100000L & l) != 0L && kind > 49)
+                     kind = 49;
                   break;
                case 72:
-                  if ((0x1000000010L & l) != 0L && kind > 50)
-                     kind = 50;
+                  if ((0x1000000010L & l) != 0L && kind > 52)
+                     kind = 52;
                   break;
                case 73:
                   if ((0x400000004000L & l) != 0L)
@@ -1770,12 +1826,12 @@ else if (curChar == 124)
                      { jjAddStates(72, 73); }
                   break;
                case 75:
-                  if ((0x400000004000L & l) != 0L && kind > 47)
-                     kind = 47;
+                  if ((0x400000004000L & l) != 0L && kind > 49)
+                     kind = 49;
                   break;
                case 76:
-                  if ((0x4000000040000L & l) != 0L && kind > 51)
-                     kind = 51;
+                  if ((0x4000000040000L & l) != 0L && kind > 53)
+                     kind = 53;
                   break;
                case 80:
                   if (curChar == 92)
@@ -1837,8 +1893,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(34, 36); }
                   break;
                case 101:
-                  if (curChar == 96 && kind > 74)
-                     kind = 74;
+                  if (curChar == 96 && kind > 76)
+                     kind = 76;
                   break;
                case 102:
                   if (curChar == 92)
@@ -1852,8 +1908,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(37, 39); }
                   break;
                case 105:
-                  if (curChar == 96 && kind > 76)
-                     kind = 76;
+                  if (curChar == 96 && kind > 78)
+                     kind = 78;
                   break;
                case 107:
                   if (curChar == 92)
@@ -1902,29 +1958,29 @@ else if (curChar == 124)
                case 138:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 84)
+                     kind = 84;
                   { jjCheckNAddTwoStates(133, 138); }
                   break;
                case 140:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 83)
+                     kind = 83;
                   { jjCheckNAddStates(0, 4); }
                   break;
                case 141:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 81)
-                     kind = 81;
+                  if (kind > 83)
+                     kind = 83;
                   { jjCheckNAdd(141); }
                   break;
                case 142:
                   if ((0x7fffffe87fffffeL & l) == 0L)
                      break;
-                  if (kind > 82)
-                     kind = 82;
+                  if (kind > 84)
+                     kind = 84;
                   { jjCheckNAddTwoStates(142, 133); }
                   break;
                case 143:
@@ -1960,8 +2016,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 150;
                   break;
                case 152:
-                  if ((0x100000001000000L & l) != 0L && kind > 64)
-                     kind = 64;
+                  if ((0x100000001000000L & l) != 0L && kind > 66)
+                     kind = 66;
                   break;
                case 153:
                case 157:
@@ -2005,8 +2061,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 162;
                   break;
                case 164:
-                  if ((0x2000000020L & l) != 0L && kind > 66)
-                     kind = 66;
+                  if ((0x2000000020L & l) != 0L && kind > 68)
+                     kind = 68;
                   break;
                case 165:
                case 168:
@@ -2154,8 +2210,8 @@ else if (curChar == 124)
                      jjstateSet[jjnewStateCnt++] = 204;
                   break;
                case 206:
-                  if ((0x800000008000L & l) != 0L && kind > 62)
-                     kind = 62;
+                  if ((0x800000008000L & l) != 0L && kind > 64)
+                     kind = 64;
                   break;
                case 207:
                   if ((0x10000000100000L & l) != 0L)
@@ -2381,8 +2437,8 @@ else if (curChar == 124)
                case 5:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
                   {
-                     if (kind > 83)
-                        kind = 83;
+                     if (kind > 85)
+                        kind = 85;
                      { jjCheckNAddTwoStates(18, 19); }
                   }
                   if (jjCanMove_1(hiByte, i1, i2, l1, l2))
@@ -2393,8 +2449,8 @@ else if (curChar == 124)
                case 18:
                   if (!jjCanMove_0(hiByte, i1, i2, l1, l2))
                      break;
-                  if (kind > 83)
-                     kind = 83;
+                  if (kind > 85)
+                     kind = 85;
                   { jjCheckNAddTwoStates(18, 19); }
                   break;
                case 79:
@@ -2410,8 +2466,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(22, 24); }
                   break;
                case 83:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 74)
-                     kind = 74;
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 76)
+                     kind = 76;
                   break;
                case 85:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -2422,8 +2478,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(25, 27); }
                   break;
                case 87:
-                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 75)
-                     kind = 75;
+                  if (jjCanMove_3(hiByte, i1, i2, l1, l2) && kind > 77)
+                     kind = 77;
                   break;
                case 90:
                case 91:
@@ -2458,8 +2514,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(40, 42); }
                   break;
                case 110:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 74)
-                     kind = 74;
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 76)
+                     kind = 76;
                   break;
                case 112:
                   if (jjCanMove_0(hiByte, i1, i2, l1, l2))
@@ -2470,8 +2526,8 @@ else if (curChar == 124)
                      { jjCheckNAddStates(43, 45); }
                   break;
                case 114:
-                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 76)
-                     kind = 76;
+                  if (jjCanMove_6(hiByte, i1, i2, l1, l2) && kind > 78)
+                     kind = 78;
                   break;
                case 117:
                case 118:
@@ -2524,11 +2580,11 @@ else if (jjmatchedPos == strPos && jjmatchedKind > strKind)
 public static final String[] jjstrLiteralImages = {
 "", null, null, null, null, null, null, null, null, null, null, null, null, 
 null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, null, null, null, null, null, null, 
-"\173", "\175", "\72", "\50", "\51", "\133", "\135", null, null, null, null, null, 
-null, null, "\74", "\76", null, null, null, null, null, null, null, null, null, null, 
-null, null, null, null, null, null, null, "\174", null, null, null, null, "\54", 
-null, null, null, null, null, null, null, null, null, "\12", "\137", "\75", };
+null, null, null, null, null, null, null, null, null, null, null, null, null, null, 
+null, "\173", "\175", "\72", "\50", "\51", "\133", "\135", null, null, null, null, 
+null, null, null, "\74", "\76", null, null, null, null, null, null, null, null, null, 
+null, null, null, null, null, null, null, null, "\174", null, null, null, null, 
+"\54", null, null, null, null, null, null, null, null, null, "\12", "\137", "\75", };
 protected Token jjFillToken()
 {
    final Token t;
@@ -2826,10 +2882,10 @@ public void SwitchTo(int lexState)
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
-   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 
 };
 static final long[] jjtoToken = {
-   0xc0fffffffffffff9L, 0x70ffff7L, 
+   0x3fffffffffffff9L, 0x1c3fffdfL, 
 };
 static final long[] jjtoSkip = {
    0x6L, 0x0L, 
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/FindOrAddSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/FindOrAddSymbol.java
new file mode 100644
index 00000000..d88ff249
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/FindOrAddSymbol.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2013-2017 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import com.cinchapi.ccl.grammar.KeyTokenSymbol;
+import com.cinchapi.ccl.grammar.ValueTokenSymbol;
+
+/**
+ * A {@link CommandSymbol} that represents a FIND_OR_ADD command.
+ * <p>
+ * This command attempts to find a unique record where the specified key
+ * equals the given value, or creates a new record with that key-value pair
+ * if no matching record exists.
+ * </p>
+ * <p>
+ * The command helps simulate a unique index by providing an atomic operation
+ * to check for a condition and add data only if that condition isn't
+ * currently satisfied.
+ * </p>
+ */
+public class FindOrAddSymbol implements CommandSymbol {
+    /**
+     * The key (field name) to search or add.
+     */
+    private final KeyTokenSymbol<?> key;
+
+    /**
+     * The value to match or add to the specified key.
+     */
+    private final ValueTokenSymbol<?> value;
+
+    /**
+     * Construct a new FindOrAdd command symbol.
+     *
+     * @param key the field name to search or add
+     * @param value the value to match or add to the field
+     */
+    public FindOrAddSymbol(KeyTokenSymbol<?> key, ValueTokenSymbol<?> value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    /**
+     * Returns the command type identifier.
+     *
+     * @return the string "FIND_OR_ADD" representing this command type
+     */
+    @Override
+    public String type() {
+        return "FIND_OR_ADD";
+    }
+
+    /**
+     * Get the key (field name) for this command.
+     *
+     * @return the key token symbol representing the field name
+     */
+    public KeyTokenSymbol<?> key() {
+        return key;
+    }
+
+    /**
+     * Get the value for this command.
+     *
+     * @return the value token symbol to match or add
+     */
+    public ValueTokenSymbol<?> value() {
+        return value;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/cinchapi/ccl/grammar/command/FindOrInsertSymbol.java b/src/main/java/com/cinchapi/ccl/grammar/command/FindOrInsertSymbol.java
new file mode 100644
index 00000000..e93bbb89
--- /dev/null
+++ b/src/main/java/com/cinchapi/ccl/grammar/command/FindOrInsertSymbol.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2013-2024 Cinchapi Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package com.cinchapi.ccl.grammar.command;
+
+import com.cinchapi.ccl.generated.ASTStart;
+import com.cinchapi.ccl.grammar.TimestampSymbol;
+
+import javax.annotation.Nullable;
+
+/**
+ * A {@link CommandSymbol} that represents a FIND_OR_INSERT command.
+ * <p>
+ * This command attempts to find a unique record matching specific criteria,
+ * or creates a new record with the provided data if no matching record exists.
+ * The command provides an atomic way to ensure data uniqueness while
+ * allowing conditional record creation.
+ * </p>
+ */
+public class FindOrInsertSymbol implements CommandSymbol {
+    /**
+     * The JSON data to insert if no matching record is found.
+     * Represents the complete object to be added to a new record.
+     */
+    private final String json;
+
+    /**
+     * Optional timestamp for historical context of the find or insert operation.
+     * Allows performing the operation at a specific point in time.
+     */
+    private final TimestampSymbol timestamp;
+
+    /**
+     * Construct a new FindOrInsert command symbol.
+     *
+     * @param json the JSON-formatted data to potentially insert
+     * @param timestamp optional timestamp for historical context
+     */
+    public FindOrInsertSymbol(String json, TimestampSymbol timestamp) {
+        this.json = json;
+        this.timestamp = timestamp;
+    }
+
+    /**
+     * Returns the command type identifier.
+     *
+     * @return the string "FIND_OR_INSERT" representing this command type
+     */
+    @Override
+    public String type() {
+        return "FIND_OR_INSERT";
+    }
+
+    /**
+     * Get the JSON data for this command.
+     *
+     * @return the JSON string to be inserted if no matching record exists
+     */
+    public String json() {
+        return json;
+    }
+
+    /**
+     * Get the timestamp for this command.
+     *
+     * @return the timestamp for historical context, or null if not specified
+     */
+    @Nullable
+    public TimestampSymbol timestamp() {
+        return timestamp;
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
index 0a14dd03..4dbaa578 100644
--- a/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
+++ b/src/test/java/com/cinchapi/ccl/CompilerJavaCCLogicTest.java
@@ -2347,37 +2347,8 @@ public void testSearchCommandTokenize() {
     }
 
     @Test
-    public void testReproIX5A() {
-        Criteria criteria = Criteria.where()
-                .group(Criteria.where().key("_")
-                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
-                        .value("org.internx.model.data.user.Student"))
-                .and()
-                .group(Criteria.where()
-                        .group(Criteria.where().key("group").operator(
-                                com.cinchapi.concourse.thrift.Operator.LIKE)
-                                .value("%Accounting And Business/management%"))
-                        .or()
-                        .group(Criteria.where().key("major").operator(
-                                com.cinchapi.concourse.thrift.Operator.LIKE)
-                                .value("%accounting and business/management%")));
-
-        // Generate tree
-        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
-                COMPILER_PARSE_OPERATOR_FUNCTION);
-        AbstractSyntaxTree ast = compiler.parse(criteria.ccl());
-        List<Symbol> tokens = compiler.tokenize(ast);
-        tokens.forEach(token -> {
-            if(token instanceof ValueSymbol) {
-                Assert.assertEquals(String.class,
-                        ((ValueSymbol) token).value().getClass());
-            }
-        });
-    }
-
-    @Test
-    public void testFindWithOrderAndPage() {
-        String ccl = "find age > 25 order by name ASC, age DESC page 1 size 10";
+    public void testGetWithOrderTimestampAndPage() {
+        String ccl = "get [name, age] where salary > 50000 " + ORDER + " age at \"2024-01-01\" " + PAGE + " 2 " + SIZE + " 5";
 
         Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
                 COMPILER_PARSE_OPERATOR_FUNCTION);
@@ -2387,29 +2358,40 @@ public void testFindWithOrderAndPage() {
         Assert.assertTrue(tree instanceof CommandTree);
         CommandTree commandTree = (CommandTree) tree;
 
+        // Validate Keys
+        GetSymbol getSymbol = (GetSymbol) commandTree.root();
+        Assert.assertEquals(2, getSymbol.keys().size());
+
         // Validate Condition
         ExpressionSymbol expression = (ExpressionSymbol) commandTree.conditionTree().root();
-        Assert.assertEquals("age", expression.key().toString());
+        Assert.assertEquals("salary", expression.key().toString());
         Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertEquals("25", expression.values().get(0).toString());
+        Assert.assertEquals("50000", expression.values().get(0).toString());
 
         // Validate Order
         OrderSymbol order = (OrderSymbol) commandTree.orderTree().root();
-        Assert.assertEquals(2, order.components().size());
-        Assert.assertEquals("name", order.components().get(0).key().toString());
-        Assert.assertEquals(DirectionSymbol.ASCENDING, order.components().get(0).direction());
-        Assert.assertEquals("age", order.components().get(1).key().toString());
-        Assert.assertEquals(DirectionSymbol.DESCENDING, order.components().get(1).direction());
+        Assert.assertEquals(1, order.components().size());
+        Assert.assertEquals("age", order.components().get(0).key().toString());
+
+        // Validate Timestamp
+        Assert.assertEquals(
+                TimeUnit.DAYS.convert(
+                        order.components().get(0).timestamp().timestamp(),
+                        TimeUnit.MICROSECONDS),
+                TimeUnit.DAYS.convert(
+                        NaturalLanguage.parseMicros("2024-01-01"),
+                        TimeUnit.MICROSECONDS)
+        );
 
         // Validate Page
         PageSymbol page = (PageSymbol) commandTree.pageTree().root();
-        Assert.assertEquals(1, page.offset());
-        Assert.assertEquals(10, page.limit());
+        Assert.assertEquals(5, page.offset());
+        Assert.assertEquals(5, page.limit());
     }
 
     @Test
-    public void testGetWithOrderTimestampAndPage() {
-        String ccl = "get [name, age] where salary > 50000 order by age at \"2024-01-01\" page 2 size 5";
+    public void testFindWithOrderAndPage() {
+        String ccl = "find age > 25 " + ORDER + " name ASC, age DESC " + SIZE + " 10 " + PAGE + " 1";
 
         Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
                 COMPILER_PARSE_OPERATOR_FUNCTION);
@@ -2419,35 +2401,53 @@ public void testGetWithOrderTimestampAndPage() {
         Assert.assertTrue(tree instanceof CommandTree);
         CommandTree commandTree = (CommandTree) tree;
 
-        // Validate Keys
-        GetSymbol getSymbol = (GetSymbol) commandTree.root();
-        Assert.assertEquals(2, getSymbol.keys().size());
-
         // Validate Condition
         ExpressionSymbol expression = (ExpressionSymbol) commandTree.conditionTree().root();
-        Assert.assertEquals("salary", expression.key().toString());
+        Assert.assertEquals("age", expression.key().toString());
         Assert.assertEquals(">", expression.operator().toString());
-        Assert.assertEquals("50000", expression.values().get(0).toString());
+        Assert.assertEquals("25", expression.values().get(0).toString());
 
         // Validate Order
         OrderSymbol order = (OrderSymbol) commandTree.orderTree().root();
-        Assert.assertEquals(1, order.components().size());
-        Assert.assertEquals("age", order.components().get(0).key().toString());
-
-        // Validate Timestamp
-        Assert.assertEquals(
-                TimeUnit.DAYS.convert(
-                        order.components().get(0).timestamp().timestamp(),
-                        TimeUnit.MICROSECONDS),
-                TimeUnit.DAYS.convert(
-                        NaturalLanguage.parseMicros("2024-01-01"),
-                        TimeUnit.MICROSECONDS)
-        );
+        Assert.assertEquals(2, order.components().size());
+        Assert.assertEquals("name", order.components().get(0).key().toString());
+        Assert.assertEquals(DirectionSymbol.ASCENDING, order.components().get(0).direction());
+        Assert.assertEquals("age", order.components().get(1).key().toString());
+        Assert.assertEquals(DirectionSymbol.DESCENDING, order.components().get(1).direction());
 
         // Validate Page
         PageSymbol page = (PageSymbol) commandTree.pageTree().root();
-        Assert.assertEquals(2, page.offset());
-        Assert.assertEquals(5, page.limit());
+        Assert.assertEquals(0, page.offset());
+        Assert.assertEquals(10, page.limit());
+    }
+
+    @Test
+    public void testReproIX5A() {
+        Criteria criteria = Criteria.where()
+                .group(Criteria.where().key("_")
+                        .operator(com.cinchapi.concourse.thrift.Operator.EQUALS)
+                        .value("org.internx.model.data.user.Student"))
+                .and()
+                .group(Criteria.where()
+                        .group(Criteria.where().key("group").operator(
+                                com.cinchapi.concourse.thrift.Operator.LIKE)
+                                .value("%Accounting And Business/management%"))
+                        .or()
+                        .group(Criteria.where().key("major").operator(
+                                com.cinchapi.concourse.thrift.Operator.LIKE)
+                                .value("%accounting and business/management%")));
+
+        // Generate tree
+        Compiler compiler = Compiler.create(COMPILER_PARSE_VALUE_FUNCTION,
+                COMPILER_PARSE_OPERATOR_FUNCTION);
+        AbstractSyntaxTree ast = compiler.parse(criteria.ccl());
+        List<Symbol> tokens = compiler.tokenize(ast);
+        tokens.forEach(token -> {
+            if(token instanceof ValueSymbol) {
+                Assert.assertEquals(String.class,
+                        ((ValueSymbol) token).value().getClass());
+            }
+        });
     }
 
     @Test
diff --git a/src/test/java/com/cinchapi/ccl/GrammarTest.java b/src/test/java/com/cinchapi/ccl/GrammarTest.java
index ad009624..69ccec88 100644
--- a/src/test/java/com/cinchapi/ccl/GrammarTest.java
+++ b/src/test/java/com/cinchapi/ccl/GrammarTest.java
@@ -479,7 +479,7 @@ public void testWithSizeAndNumber() throws UnsupportedEncodingException, ParseEx
 
     @Test
     public void validUnaryOperatorWithPage() throws UnsupportedEncodingException, ParseException {
-        String ccl = "a = 1 page 1 size 3";
+        String ccl = "a = 1 " + PAGE + " 1 " + SIZE + " 3";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(
                 StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
@@ -689,7 +689,7 @@ public void testIndexFunctionWithTimestamp2() throws UnsupportedEncodingExceptio
 
     @Test
     public void testOrderByTimestamp() throws UnsupportedEncodingException, ParseException {
-        String ccl = "order by > age in 1992-10-02";
+        String ccl = "" + ORDER + " > age in 1992-10-02";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(
                 StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
@@ -1200,7 +1200,7 @@ public void testBasicFind() throws UnsupportedEncodingException, ParseException
 
     @Test
     public void testFindWithOrder() throws UnsupportedEncodingException, ParseException {
-        String ccl = "find name = \"John\" order by age";
+        String ccl = "find name = \"John\" " + ORDER + " age";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -1209,7 +1209,7 @@ public void testFindWithOrder() throws UnsupportedEncodingException, ParseExcept
 
     @Test
     public void testFindWithOrderAndPage() throws UnsupportedEncodingException, ParseException {
-        String ccl = "find name = \"John\" order by age page 1 size 10";
+        String ccl = "find name = \"John\" " + ORDER + " age " + PAGE + " 1 " + SIZE + " 10";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -1254,7 +1254,7 @@ public void testFindWithRegex() throws UnsupportedEncodingException, ParseExcept
 
     @Test
     public void testFindWithMultipleOrderCriteria() throws UnsupportedEncodingException, ParseException {
-        String ccl = "find age > 25 order by name ASC, age DESC";
+        String ccl = "find age > 25 " + ORDER + " name ASC, age DESC";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -1335,7 +1335,7 @@ public void testGetKeysWithCriteria() throws UnsupportedEncodingException, Parse
 
     @Test
     public void testGetWithCriteriaAndOrder() throws UnsupportedEncodingException, ParseException {
-        String ccl = "get [name, age] where age > 25 order by age DESC";
+        String ccl = "get [name, age] where age > 25 " + ORDER + " age DESC";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -1344,7 +1344,7 @@ public void testGetWithCriteriaAndOrder() throws UnsupportedEncodingException, P
 
     @Test
     public void testGetWithCriteriaAndPagination() throws UnsupportedEncodingException, ParseException {
-        String ccl = "get [name, age] where age > 25 page 1 size 10";
+        String ccl = "get [name, age] where age > 25 " + PAGE + " 1 " + SIZE + " 10";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -1362,7 +1362,7 @@ public void testGetWithComplexCriteria() throws UnsupportedEncodingException, Pa
 
     @Test
     public void testGetWithTimestampAndOrder() throws UnsupportedEncodingException, ParseException {
-        String ccl = "get [name, age] where age > 25 at \"2024-01-01\" order by age ASC";
+        String ccl = "get [name, age] where age > 25 at \"2024-01-01\" " + ORDER + " age ASC";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -1632,7 +1632,7 @@ public void testSelectWithCriteria() throws UnsupportedEncodingException, ParseE
 
     @Test
     public void testSelectWithTimestampAndOrder() throws UnsupportedEncodingException, ParseException {
-        String ccl = "select [name, age] where age > 25 at \"2024-01-01\" order by age DESC";
+        String ccl = "select [name, age] where age > 25 at \"2024-01-01\" " + ORDER + " age DESC";
         InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
         Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
@@ -1755,6 +1755,106 @@ public void testInvalidVerifyAndSwapMissingReplacement() throws UnsupportedEncod
                 PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
         grammar.generateAST();
     }
+
+    @Test
+    public void testTraceBasicSingleRecord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "trace 1";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testTraceMultipleRecords() throws UnsupportedEncodingException, ParseException {
+        String ccl = "trace [1, 2, 3]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testTraceSingleRecordWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "trace 1 at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testTraceMultipleRecordsWithTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "trace [1, 2, 3] at \"2024-01-01\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testTraceWithNaturalLanguageTimestamp() throws UnsupportedEncodingException, ParseException {
+        String ccl = "trace 1 at \"two weeks ago\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidTraceNoRecord() throws UnsupportedEncodingException, ParseException {
+        String ccl = "trace";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test(expected = ParseException.class)
+    public void testInvalidTraceMalformedRecordList() throws UnsupportedEncodingException, ParseException {
+        String ccl = "trace [1,,2]";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFindOrAddBasic() throws UnsupportedEncodingException, ParseException {
+        String ccl = "findOrAdd name as \"John\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFindOrAddNumericValue() throws UnsupportedEncodingException, ParseException {
+        String ccl = "findOrAdd age as 25";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFindOrInsertWithCriteria() throws UnsupportedEncodingException, ParseException {
+        String ccl = "findOrInsert age > 25 \"{'name': 'John', 'age': 30}\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
+    @Test
+    public void testFindOrInsertWithComplexCriteria() throws UnsupportedEncodingException, ParseException {
+        String ccl = "findOrInsert (age > 25 and city = \"NYC\") \"{'name': 'John', 'age': 30, 'city': 'NYC'}\"";
+        InputStream stream = new ByteArrayInputStream(ccl.getBytes(StandardCharsets.UTF_8.name()));
+        Grammar grammar = new Grammar(stream, PARSER_TRANSFORM_VALUE_FUNCTION,
+                PARSER_TRANSFORM_OPERATOR_FUNCTION, visitor);
+        grammar.generateAST();
+    }
+
     /**
      * Constants
      */